Mercurial > prosody-modules
changeset 4890:347894e08b4f
mod_bookmarks2: Remove conflict check with mod_bookmarks
Should no longer be needed and causes trouble when mod_bookmarks
(community) redirects to mod_bookmarks2
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Wed, 09 Feb 2022 18:10:27 +0100 |
| parents | 52522c71ad1a |
| children | 99cdc7cde150 |
| files | mod_bookmarks2/mod_bookmarks2.lua |
| diffstat | 1 files changed, 0 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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;