Skip to content

Commit e489d31

Browse files
committed
Fixed conflicts
1 parent 99d2e24 commit e489d31

File tree

8 files changed

+13
-12
lines changed

8 files changed

+13
-12
lines changed
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

30DaysOfJavaScript/script.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ function search_project() {
189189
{ name: "Maze Game", url: "./112 - Maze Game/index.html" },
190190
{ name: "Minesweeper", url: "./113 - Minesweeper/index.html" },
191191
{ name: "Guess the Country", url: "./115 - Guess The Country/index.html"},
192-
{ name: "2048 Game", url: "./122 - 2048 Game/index.html"}
192+
{ name: "2048 Game", url: "./124 - 2048 Game/index.html"}
193193
];
194194

195195
// Filter suggestions based on input

README.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -164,11 +164,12 @@ Repo containing all the projects made in 30 Days while completing the <b>30 Days
164164
| 109 | [Number Facts](https://30daysofjs.netlify.app/145%20-%20Number%20Facts/) |
165165
| 110 | [Pixel to em Converter](https://30daysofjs.netlify.app/110%20-%20Pixel%20to%20em%20Converter/) |
166166
| 111 | [Luminosity Particle Js](https://30daysofjs.netlify.app/141%20-%20Luminosity%20Particle%20Js/) |
167-
| 112 | [Maze Game](https://30daysofjs.netlify.app/112%20-%20Maze%20Game/) |
168-
| 113 | [Minesweeper](https://30daysofjs.netlify.app/113%20-%20minesweeper/)
169-
| 114 | [Movie Guessing Game]()
170-
| 116 | [Shell Game](https://30daysofjs.netlify.app/116%20-%20Shell%20-%20Game/)
171-
| 118 | [2048 Game]() |
167+
| 112 | [Maze Game](https://30daysofjs.netlify.app/112%20-%20Maze%20Game/) |
168+
| 113 | [Minesweeper](https://30daysofjs.netlify.app/113%20-%20minesweeper/) |
169+
| 114 | [Movie Guessing Game]() |
170+
| 116 | [Shell Game](https://30daysofjs.netlify.app/116%20-%20Shell%20-%20Game/) |
171+
| 124 | [2048 Game](https://30daysofjs.netlify.app/124%20-%202048%20Game/) |
172+
172173
</td><td>
173174
</td></tr></table>
174175

index.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1870,12 +1870,12 @@ <h4>Tower of Hanoi</h4>
18701870
</a>
18711871
</div>
18721872
<div class="item">
1873-
<img src="30DaysOfJavaScript\assets\122.png" alt="2048 Game">
1873+
<img src="30DaysOfJavaScript\assets\124.png" alt="2048 Game">
18741874
<h4>2048 Game</h4>
18751875
<a target="_blank"
1876-
href="https://github.com/swapnilsparsh/30DaysOfJavaScript/tree/master/122%20-%202048%20Game">
1876+
href="https://github.com/swapnilsparsh/30DaysOfJavaScript/tree/master/124%20-%202048%20Game">
18771877
<i class="fa-brands fa-square-github"></i>
1878-
<a target="_blank" href="122 - 2048 Game/index.html"><i class="fa-solid fa-link"></i> </a>
1878+
<a target="_blank" href="124 - 2048 Game/index.html"><i class="fa-solid fa-link"></i> </a>
18791879
</a>
18801880
<div class="description">
18811881
<p> Use your arrow keys to move the tiles. When two tiles with the same number touch, they merge into one!

indexold.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1884,12 +1884,12 @@ <h4>3D Distance Calculator</h4>
18841884
</div>
18851885
</div>
18861886
<div class="item">
1887-
<img src="30DaysOfJavaScript\assets\122.png" alt="2048 Game">
1887+
<img src="30DaysOfJavaScript\assets\124.png" alt="2048 Game">
18881888
<h4>2048 Game</h4>
18891889
<a target="_blank"
1890-
href="https://github.com/swapnilsparsh/30DaysOfJavaScript/tree/master/122%20-%202048%20Game">
1890+
href="https://github.com/swapnilsparsh/30DaysOfJavaScript/tree/master/124%20-%202048%20Game">
18911891
<i class="fa-brands fa-square-github"></i>
1892-
<a target="_blank" href="122 - 2048 Game/index.html"><i class="fa-solid fa-link"></i> </a>
1892+
<a target="_blank" href="124 - 2048 Game/index.html"><i class="fa-solid fa-link"></i> </a>
18931893
</a>
18941894
<div class="description">
18951895
<p> Use your arrow keys to move the tiles. When two tiles with the same number touch, they merge into one!

0 commit comments

Comments
 (0)