From 2d6b26cd39421df320ed09bddc2eda8ea0b56acc Mon Sep 17 00:00:00 2001 From: Mirco Wittrien Date: Wed, 3 Mar 2021 13:44:48 +0100 Subject: [PATCH] stuff --- Library/0BDFDB.plugin.js | 6 ------ Library/_res/BDFDB.data.json | 3 --- 2 files changed, 9 deletions(-) diff --git a/Library/0BDFDB.plugin.js b/Library/0BDFDB.plugin.js index d0bb531b28..ea2ef96a9e 100644 --- a/Library/0BDFDB.plugin.js +++ b/Library/0BDFDB.plugin.js @@ -7364,13 +7364,7 @@ module.exports = (_ => { let MessageHeaderExport = BDFDB.ModuleUtils.findByProperties("MessageTimestamp", false); InternalBDFDB.processMessage = function (e) { -<<<<<<< HEAD - if (MessageHeaderExport && BDFDB.ObjectUtils.get(e, "instance.props.childrenHeader.type.type.name") && BDFDB.ObjectUtils.get(e, "instance.props.childrenHeader.props.message")) { - e.instance.props.childrenHeader.type = MessageHeaderExport.exports.default; - } -======= if (MessageHeaderExport && BDFDB.ObjectUtils.get(e, "instance.props.childrenHeader.type.type.name") && BDFDB.ObjectUtils.get(e, "instance.props.childrenHeader.props.message")) e.instance.props.childrenHeader.type = MessageHeaderExport.exports.default; ->>>>>>> development if (e.returnvalue && e.returnvalue.props && e.returnvalue.props.children && e.returnvalue.props.children.props) { let message; for (let key in e.instance.props) { diff --git a/Library/_res/BDFDB.data.json b/Library/_res/BDFDB.data.json index 97f27f7896..344f9998aa 100644 --- a/Library/_res/BDFDB.data.json +++ b/Library/_res/BDFDB.data.json @@ -202,10 +202,7 @@ "InviteGuildName": {"props": ["GuildName", "GuildTemplateName"]}, "InviteCard": {"class": "guildsettingsinvitecard"}, "MemberCard": {"class": "guildsettingsmembercard"}, -<<<<<<< HEAD -======= "Message": {"strings": ["childrenMessageContent", "childrenRepliedMessage", "zalgo"]}, ->>>>>>> development "MessageHeader": {"props": ["MessageTimestamp"]}, "Messages": {"strings": ["group-spacing-", "canManageMessages"]}, "MessageUsername": {"strings": ["default.username", "colorString", "compact"]},