aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorhannibal2 <24389977+hannibal00212@users.noreply.github.com>2023-10-30 00:01:36 +0100
committerhannibal2 <24389977+hannibal00212@users.noreply.github.com>2023-10-30 00:01:36 +0100
commit3f3ead4265dc7814f7e34f9c60ec83ad5cb45c83 (patch)
tree3d53cb5c899cc430ac359739d73559879473f37e /src/main
parent01987602d40b387101af4d324650c4e173796f59 (diff)
downloadskyhanni-3f3ead4265dc7814f7e34f9c60ec83ad5cb45c83.tar.gz
skyhanni-3f3ead4265dc7814f7e34f9c60ec83ad5cb45c83.tar.bz2
skyhanni-3f3ead4265dc7814f7e34f9c60ec83ad5cb45c83.zip
Revert "testing merge conflict bot"
This reverts commit 01987602d40b387101af4d324650c4e173796f59.
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
index 856e9ca16..326f5798f 100644
--- a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
+++ b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
@@ -614,7 +614,6 @@ class SkyHanniMod {
loadModule(ShiftClickEquipment())
loadModule(LockMouseLook)
loadModule(DungeonFinderFeatures())
- // bulling contributors <3
init()