# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1577757132 -3600
# Node ID 16099e8964d86f1bc6cfb30ff81344e0ed2869ac
# Parent  f88f1151bc72c980168cdc1a7bf88d74a68d10da# Parent  419ac5ef2d3d74274971ecfedd6dab26059ce6df
Merge 0.11->trunk

diff -r f88f1151bc72 -r 16099e8964d8 prosodyctl
--- a/prosodyctl	Mon Dec 30 09:54:49 2019 +0100
+++ b/prosodyctl	Tue Dec 31 02:52:12 2019 +0100
@@ -973,9 +973,15 @@
 			end
 		end
 		if all_modules:contains("vcard") and all_modules:contains("vcard_legacy") then
+			print("");
 			print("    Both mod_vcard_legacy and mod_vcard are enabled but they conflict");
 			print("    with each other. Remove one.");
 		end
+		if all_modules:contains("pep") and all_modules:contains("pep_simple") then
+			print("");
+			print("    Both mod_pep_simple and mod_pep are enabled but they conflict");
+			print("    with each other. Remove one.");
+		end
 		for host, host_config in pairs(config) do --luacheck: ignore 213/host
 			if type(rawget(host_config, "storage")) == "string" and rawget(host_config, "default_storage") then
 				print("");