update issue with script

Author: Moiz-CodeByte

Day #12 - 2048 Game/script.js

@@ -133,8 +133,5 @@ function initGame() {
     createGrid();
 }
 
-<<<<<<< HEAD
-initGame();
-=======
+
 initGame();
->>>>>>> d356d960aeda2d0b57ba5db5aab56408f94664e1

Day #12 - 2048 Game/style.css

@@ -5,7 +5,6 @@ body {
     align-items: center;
     height: 100vh;
     margin: 0;
-<<<<<<< HEAD
     background-color: #f7592b;
 }
 
@@ -15,13 +14,6 @@ body {
     border-radius: 15px;
     text-align: center;
 
-=======
-    background-color: #faf8ef;
-}
-
-.container {
-    text-align: center;
->>>>>>> d356d960aeda2d0b57ba5db5aab56408f94664e1
 }
 
 .game-container {
@@ -68,8 +60,4 @@ body {
     margin-top: 20px;
     font-size: 24px;
     font-weight: bold;
-<<<<<<< HEAD
-}
-=======
 }
->>>>>>> d356d960aeda2d0b57ba5db5aab56408f94664e1