Skip to content

Commit 03f839c

Browse files
fix: resolve merge conflicts and broken syntax in main.js and index.html
1 parent 2d75e97 commit 03f839c

2 files changed

Lines changed: 561 additions & 1367 deletions

File tree

web-app/index.html

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -127,12 +127,7 @@ <h3>BlackJack21</h3>
127127
<h3>Calculator</h3>
128128
<p>Your mathematical companion!</p>
129129
</div>
130-
<div class="project-card" data-category="utilities" data-project="caesar-cipher" data-tags="utility,caesar,cipher,encryption,decryption">
131-
<img class="card-banner" src="assets/banners/caesar-cipher.jpg" alt="Caesar Cipher" loading="lazy">
132-
<div class="card-actions"><button class="btn-play">Try It</button></div>
133-
<h3>Caesar Cipher</h3>
134-
<p>Encrypt &amp; decrypt with a shift!</p>
135-
</div>
130+
136131
<div class="project-card" data-category="games" data-project="coin-flip" data-tags="game,random,animation,probability,heads,tails">
137132
<img class="card-banner" src="assets/banners/coin-flip.jpg" alt="Coin Flip" loading="lazy">
138133
<div class="card-actions"><button class="btn-play">Try It</button></div>
@@ -702,7 +697,6 @@ <h3>Legal</h3>
702697
<script src="js/projects/snake.js"></script>
703698
<script src="js/projects/spot-the-difference.js"></script>
704699
<script src="js/projects/color-palette.js"></script>
705-
<script src="js/projects/ceasar-cipher.js"></script>
706700
<script src="js/projects/resume-analyzer.js"></script>
707701
<!-- Registry: maps project names to their module functions -->
708702
<script src="js/projects.js"></script>
@@ -712,7 +706,6 @@ <h3>Legal</h3>
712706
<script src="js/main.js"></script>
713707
<script src="js/hero-canvas.js"></script>
714708
<script>lucide.createIcons();</script>
715-
<script>lucide.createIcons();</script>
716709
<script src="js/fix.js"></script>
717710

718711
<div class="search-kbd-hint" id="searchKbdHint" aria-hidden="true">

0 commit comments

Comments
 (0)