uwu

FunkinCrew · Feb 12, 2025 · 05c4ac4 · 05c4ac4
1 parent fb061b7
commit 05c4ac4
Showing 1 changed file with 0 additions and 17 deletions.
diff --git a/source/funkin/ui/debug/stageeditor/StageEditorState.hx b/source/funkin/ui/debug/stageeditor/StageEditorState.hx
@@ -138,10 +138,6 @@ class StageEditorState extends UIState
 
   function set_selectedSprite(value:StageEditorObject)
   {
-<<<<<<< HEAD
-=======
-
->>>>>>> fba258f1afdb8a95a3b975abc34be7729b284e47
     selectedSprite?.selectedShader.setAmount(0);
     this.selectedSprite = value;
     updateDialog(StageEditorDialogType.OBJECT);
@@ -587,14 +583,9 @@ class StageEditorState extends UIState
       if (FlxG.keys.justPressed.DELETE) onMenuItemClick("delete object");
       if (FlxG.keys.justPressed.ENTER) onMenuItemClick("test stage");
       if (FlxG.keys.justPressed.ESCAPE) onMenuItemClick("exit");
-<<<<<<< HEAD
       if (FlxG.keys.justPressed.F1) onMenuItemClick("user guide");
       if (FlxG.keys.justPressed.BACKSPACE) selectedSprite = null;
 
-=======
-      if (FlxG.keys.justPressed.F1 && welcomeDialog == null && userGuideDialog == null) onMenuItemClick("user guide");
->>>>>>> 3df14521e88160a142f5a49f9bd22b6d8193dc12
-
       if (FlxG.keys.justPressed.T)
       {
         camFollow.screenCenter();
@@ -638,10 +629,6 @@ class StageEditorState extends UIState
 
           if (FlxG.mouse.justPressed && allowInput && spr.visible && !FlxG.keys.pressed.SHIFT && !isCursorOverHaxeUI)
           {
-<<<<<<< HEAD
-=======
-
->>>>>>> fba258f1afdb8a95a3b975abc34be7729b284e47
             selectedSprite = spr;
             updateDialog(StageEditorDialogType.OBJECT);
           }
@@ -1172,10 +1159,6 @@ class StageEditorState extends UIState
 
         saved = true;
         reloadRecentFiles();
-<<<<<<< HEAD
-=======
-
->>>>>>> fba258f1afdb8a95a3b975abc34be7729b284e47
       case "open stage":
         if (!saved)
         {