Merge fix

game/mods_example/template/chapter2_redo.rpy

@@ -8,8 +8,6 @@ label chapter_2_new:
     play music 'audio/OST/Those Other Two Weirdos.ogg'
     show anon neutral flip at aright with dissolve
     A "Sample Text"
-<<<<<<< HEAD
-=======
     F "Sample Text"
     Lucy "Sample Text"
     Ro "Sample Text"
@@ -35,5 +33,4 @@ label chapter_2_new:
     carl "Sample Text"
     Drf "Sample Text"
     FRT "Sample Text"
->>>>>>> origin/Monster-Update-6
     return

game/screens.rpy

@@ -39,27 +39,6 @@ init python:
 #      renpy.play("audio/ui/uiOptionOn.wav")
 #    preferences.all_mute = not preferences.all_mute
 
-=======
- if renpy.variant("pc"): #Don't run this on mobile, not supported
-  if persistent.updateresult is None:
-   persistent.updateresult = "No new version is available"
-  if persistent.autoup is None:
-   persistent.autoup = False
-  if persistent.updateWebServer is None:
-   persistent.updateWebServer = "http://updates.snootgame.xyz/updates.json"
-
-  def UpdateCheck():
-   # WHY YES I ONLY ALLOW PEOPLE USING MY FRAMEWORK TO CHECK FOR AN UPDATE EVERY SIX FUCKING HOURS HOW DID YOU KNOW
-   # NOPE check_interval=5 (5 SECONDS) FUCK YOU
-   pendingVersion = updater.UpdateVersion(persistent.updateWebServer, check_interval=5)
-   if pendingVersion == None or pendingVersion == config.version or "TEST" in pendingVersion:
-     persistent.updateresult = "No new version is available"
-   else:
-     persistent.updateresult = pendingVersion
-
-  def ToggleAutoUpdate():
-     persistent.autoup = not persistent.autoup
->>>>>>> origin/Monster-Update-6
 
 ################################################################################
 ## Initialization

game/src/mod_menu.rpy

@@ -10,13 +10,10 @@ screen mod_menu_button(filename, label, function):
         xmaximum 600
         ymaximum 129
         action function
-<<<<<<< HEAD
         if 'Back' in label or 'Return' in label or 'Quit' in label or 'Main Menu' in label:
             activate_sound "audio/ui/uiBack.wav"
         else:
             activate_sound "audio/ui/uiClick.wav"
-=======
->>>>>>> origin/Monster-Update-6
         fixed:
             add filename xalign 0.5 yalign 0.5 zoom 0.9
             text label xalign 0.5 yalign 0.5 xanchor 0.5 size 34