Update __init__.py

coillteoir · Oct 12, 2023 · a6504c2 · a6504c2
1 parent 4e126c9
commit a6504c2
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/bot/__init__.py b/bot/__init__.py
@@ -120,6 +120,7 @@ async def on_message(message):
 
         if any(element in contents for element in GOOD_MORNING_PHRASES):
             print(f'gm detected > "{message.content}" by {message.author}')
+<<<<<<< HEAD
 
             # Get the previous days earlybird user, if one exists
             previous_earlybird_user = None
@@ -134,6 +135,11 @@ async def on_message(message):
                         if FIRST_GM is False:
                             FIRST_GM_USER = message.author
                             FIRST_GM = True
+=======
+            if FIRST_GM is False:
+                FIRST_GM_USER = message.author
+                FIRST_GM = True
+>>>>>>> parent of adb38b5 (Update __init__.py)
 
                 # Add the earlybird role to the first user to say good morning
                 if EARLYBIRD_ROLE: