# HG changeset patch # User Matthew Wild # Date 1738861620 0 # Node ID 3e7fe14921d08df6bb969f9a76b5c5d483640477 # Parent e977174082ee31b7beac26e779cad99f00ba6b22 mod_vcard_muc: Add conflict with Prosody versions that have native MUC vcards diff -r e977174082ee -r 3e7fe14921d0 mod_vcard_muc/mod_vcard_muc.lua --- a/mod_vcard_muc/mod_vcard_muc.lua Thu Feb 06 10:24:30 2025 +0000 +++ b/mod_vcard_muc/mod_vcard_muc.lua Thu Feb 06 17:07:00 2025 +0000 @@ -6,6 +6,7 @@ -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information. -- +--% conflicts: muc_vcard local st = require "util.stanza" local jid_split = require "util.jid".split;