dfgdf

2026-08-06 08:53:27 +02:00 · 2024-09-26 22:17:38 +01:00
parent 480a75e30c
commit ceef493b01
1 changed files with 0 additions and 6 deletions
@@ -107,15 +107,9 @@ def handle_ping(message, hop, snr, rssi, isDM):
        msg = "🏓 PONG \n"
    elif "test" in message.lower() or "testing" in message.lower():
        msg = random.choice(["🎙Testing 1,2,3 \n", "🎙Testing \n",\
-<<<<<<< HEAD
                             "🎙Testing, testing \n",\
                             "🎙Ah-wun, ah-two... \n", "🎙Is this thing on? \n",\
                             "🎙Roger that. \n",])
-=======
-                            "🎙Testing, testing \n",\
-                            "🎙Ah-wun, ah-two... \n", "🎙Is this thing on? \n",\
-                            "🎙Roger that. \n",])
->>>>>>> 0baec883219657cd42be51b43751a63caf8c0560
    elif "ack" in message.lower():
        msg = random.choice(["✋ACK-ACK!\n", "Ack to you!\n"])
    else: