merge: fix conflict

fishy-studioz · Dec 22, 2024 · a7a3266 · a7a3266
2 parents 6baa587 + 446ddb4
commit a7a3266
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/index.md b/src/index.md
@@ -18,4 +18,5 @@ We have a team of very talented developers including:
   <li class="listed"><span><a href="https://leesu220.artstation.com">Lee (3D artist)</a></span></li>
   <li class="listed"><span><a href="https://twitter.com/TypicalXYZ">Typical (VFX)</a></span></li>
   <li class="listed"><span><a href="https://open.spotify.com/artist/0HrtPfvpLfhGNE3suMtNLk">MyTrumpCard (composer)</a></span></li>
+  <li class="listed"><span><a href="https://twitter.com/mrdanpandan">39dan (advisor)</a></span></li>
 </ul>