rebase final resolution

1 files changed, 7 insertions, 19 deletions

diff --git a/src/main.c b/src/main.c
index 1a4fff2..4093b2e 100644
--- a/src/main.c
+++ b/src/main.c
@@ -21,27 +21,15 @@ int main(void) {
         return 1;
     }
 
-    if (!AddScene(CreatePuzzleCollectionScene("puzzles"))) {
-        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");
+    // if (!AddScene(CreatePuzzleCollectionScene("puzzles"))) {
+        // printf("Failed to create a collection scene\n");
         // return 1;
     // }
+    
+    if (!AddScene(CreatePuzzleScene(puzzle))) {
+        printf("Failed to create a puzzle menu\n");
+        return 1;
+    }
   
     SetConfigFlags(FLAG_WINDOW_RESIZABLE);
     InitWindow(800, 600, "Programming game");