From ceef493b01d62a4490c91b391b35faa3ef6905a5 Mon Sep 17 00:00:00 2001 From: Nestpebble Date: Thu, 26 Sep 2024 22:17:38 +0100 Subject: [PATCH] dfgdf --- mesh_bot.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/mesh_bot.py b/mesh_bot.py index 7571cbd..1d3f772 100755 --- a/mesh_bot.py +++ b/mesh_bot.py @@ -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: