puzzle selection scene

1 files changed, 13 insertions, 1 deletions

diff --git a/src/main.c b/src/main.c
index e7275dc..1a4fff2 100644
--- a/src/main.c
+++ b/src/main.c
@@ -25,12 +25,24 @@ int main(void) {
         printf("Failed to create a collection scene\n");
         return 1;
     }
+<<<<<<< HEAD
 
+||||||| parent of cc0a4ad (puzzle selection scene)
+
+    DeleteSceneFromStack();
+    return 0;
+
+=======
+// 
+    // DeleteSceneFromStack();
+    // return 0;
+// 
+>>>>>>> cc0a4ad (puzzle selection scene)
     // if (!AddScene(CreatePuzzleScene(puzzle))) {
         // printf("Failed to create a puzzle menu\n");
         // return 1;
     // }
-    
+  
     SetConfigFlags(FLAG_WINDOW_RESIZABLE);
     InitWindow(800, 600, "Programming game");
     LoadResources();