From 164844f95a2d431dc08ba02853be9197718a91ce Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Tue, 16 Jul 2019 16:25:16 +0200
Subject: jabberd2: add conflicts=jabberd2-git

---
 jabberd2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'jabberd2')

diff --git a/jabberd2 b/jabberd2
index a8561ebb..1c5a8583 160000
--- a/jabberd2
+++ b/jabberd2
@@ -1 +1 @@
-Subproject commit a8561ebb4d507bb07cfde25768c72eca0bb04caa
+Subproject commit 1c5a8583392a57010510056a0e93827e0ce1589f
-- 
cgit v1.2.3-54-g00ecf