Skip to content

Commit

Permalink
fixing merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
hannibal002 committed Feb 10, 2024
1 parent 5c4cd9b commit 9f72e7d
Showing 1 changed file with 1 addition and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
class GeorgeDisplay {

private val config get() = SkyHanniMod.feature.misc.pets.george
private val useFandomWiki get() = SkyHanniMod.feature.commands.fandomWiki.enabled
private val useFandomWiki get() = SkyHanniMod.feature.commands.betterWiki.useFandom

private val SEPARATOR = ";"

Expand Down

0 comments on commit 9f72e7d

Please sign in to comment.