Removed random crap

How did it get there?!
2015-10-28 18:49:52 +02:00
parent 3d34f15c41
commit b369ea7557
1 changed files with 0 additions and 3 deletions
--- a/main.py
+++ b/main.py
@@ -54,11 +54,8 @@ shared["load_modules"] = [
    "webtoken",
    # Adds /lol, broadcasts random funyy messages. A bit like the splash text in the menu
    "saylol",
-<<<<<<< HEAD
-=======
    # Adds /signalstrength, lets you request a signal strength and an amount of items will be inserted into target container to meet that strength.
    "signalstrength",
->>>>>>> b4f5a68e4e3ba4993e8326d2f11f9582933b694e
    # Shows the owner of a skull when right-clicked
    "skullclick",
    # Adds /listen, highlights chat and plays a sound when your name was mentioned