# HG changeset patch # User Kim Alvefur # Date 1644426627 -3600 # Node ID 347894e08b4fd4eb5a615fe36d702d38030e199b # Parent 52522c71ad1adf55aaf7e0f6c33ef61f2af984d0 mod_bookmarks2: Remove conflict check with mod_bookmarks Should no longer be needed and causes trouble when mod_bookmarks (community) redirects to mod_bookmarks2 diff -r 52522c71ad1a -r 347894e08b4f mod_bookmarks2/mod_bookmarks2.lua --- a/mod_bookmarks2/mod_bookmarks2.lua Wed Feb 09 00:34:36 2022 +0100 +++ b/mod_bookmarks2/mod_bookmarks2.lua Wed Feb 09 18:10:27 2022 +0100 @@ -1,7 +1,3 @@ -local mm = require "core.modulemanager"; -if mm.get_modules_for_host(module.host):contains("bookmarks") then - error("mod_bookmarks2 and mod_bookmarks are conflicting, please disable one of them.", 0); -end local st = require "util.stanza"; local jid_split = require "util.jid".split;