fix: conflict

RedDuck-Software · Jan 10, 2025 · 3a73179 · 3a73179
2 parents 2a26abc + 1705580
commit 3a73179
Show file tree

Hide file tree

Showing 79 changed files with 1 addition and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -23,7 +23,4 @@ dist-ssr
 *.sln
 *.sw?
 .env
-
-.yarn/
-
-install-state.gz
+.yarn
diff --git a/public/images/cards/0.jpg b/public/images/cards/0.jpg
diff --git a/public/images/cards/1.jpg b/public/images/cards/1.jpg
diff --git a/public/images/cards/10.jpg b/public/images/cards/10.jpg
diff --git a/public/images/cards/11.jpg b/public/images/cards/11.jpg
diff --git a/public/images/cards/12.jpg b/public/images/cards/12.jpg
diff --git a/public/images/cards/13.jpg b/public/images/cards/13.jpg
diff --git a/public/images/cards/14.jpg b/public/images/cards/14.jpg
diff --git a/public/images/cards/15.jpg b/public/images/cards/15.jpg
diff --git a/public/images/cards/16.jpg b/public/images/cards/16.jpg
diff --git a/public/images/cards/17.jpg b/public/images/cards/17.jpg
diff --git a/public/images/cards/18.jpg b/public/images/cards/18.jpg
diff --git a/public/images/cards/19.jpg b/public/images/cards/19.jpg
diff --git a/public/images/cards/2.jpg b/public/images/cards/2.jpg
diff --git a/public/images/cards/20.jpg b/public/images/cards/20.jpg
diff --git a/public/images/cards/21.jpg b/public/images/cards/21.jpg
diff --git a/public/images/cards/22.jpg b/public/images/cards/22.jpg
diff --git a/public/images/cards/23.jpg b/public/images/cards/23.jpg
diff --git a/public/images/cards/24.jpg b/public/images/cards/24.jpg
diff --git a/public/images/cards/25.jpg b/public/images/cards/25.jpg
diff --git a/public/images/cards/26.jpg b/public/images/cards/26.jpg
diff --git a/public/images/cards/27.jpg b/public/images/cards/27.jpg
diff --git a/public/images/cards/28.jpg b/public/images/cards/28.jpg
diff --git a/public/images/cards/29.jpg b/public/images/cards/29.jpg
diff --git a/public/images/cards/3.jpg b/public/images/cards/3.jpg
diff --git a/public/images/cards/30.jpg b/public/images/cards/30.jpg
diff --git a/public/images/cards/31.jpg b/public/images/cards/31.jpg
diff --git a/public/images/cards/32.jpg b/public/images/cards/32.jpg
diff --git a/public/images/cards/33.jpg b/public/images/cards/33.jpg
diff --git a/public/images/cards/34.jpg b/public/images/cards/34.jpg
diff --git a/public/images/cards/35.jpg b/public/images/cards/35.jpg
diff --git a/public/images/cards/36.jpg b/public/images/cards/36.jpg
diff --git a/public/images/cards/37.jpg b/public/images/cards/37.jpg
diff --git a/public/images/cards/38.jpg b/public/images/cards/38.jpg
diff --git a/public/images/cards/39.jpg b/public/images/cards/39.jpg
diff --git a/public/images/cards/4.jpg b/public/images/cards/4.jpg
diff --git a/public/images/cards/40.jpg b/public/images/cards/40.jpg
diff --git a/public/images/cards/41.jpg b/public/images/cards/41.jpg
diff --git a/public/images/cards/42.jpg b/public/images/cards/42.jpg
diff --git a/public/images/cards/43.jpg b/public/images/cards/43.jpg
diff --git a/public/images/cards/44.jpg b/public/images/cards/44.jpg
diff --git a/public/images/cards/45.jpg b/public/images/cards/45.jpg
diff --git a/public/images/cards/46.jpg b/public/images/cards/46.jpg
diff --git a/public/images/cards/47.jpg b/public/images/cards/47.jpg
diff --git a/public/images/cards/48.jpg b/public/images/cards/48.jpg
diff --git a/public/images/cards/49.jpg b/public/images/cards/49.jpg
diff --git a/public/images/cards/5.jpg b/public/images/cards/5.jpg
diff --git a/public/images/cards/50.jpg b/public/images/cards/50.jpg
diff --git a/public/images/cards/51.jpg b/public/images/cards/51.jpg
diff --git a/public/images/cards/52.jpg b/public/images/cards/52.jpg
diff --git a/public/images/cards/53.jpg b/public/images/cards/53.jpg
diff --git a/public/images/cards/54.jpg b/public/images/cards/54.jpg
diff --git a/public/images/cards/55.jpg b/public/images/cards/55.jpg
diff --git a/public/images/cards/56.jpg b/public/images/cards/56.jpg
diff --git a/public/images/cards/57.jpg b/public/images/cards/57.jpg
diff --git a/public/images/cards/58.jpg b/public/images/cards/58.jpg
diff --git a/public/images/cards/59.jpg b/public/images/cards/59.jpg
diff --git a/public/images/cards/6.jpg b/public/images/cards/6.jpg
diff --git a/public/images/cards/60.jpg b/public/images/cards/60.jpg
diff --git a/public/images/cards/61.jpg b/public/images/cards/61.jpg
diff --git a/public/images/cards/62.jpg b/public/images/cards/62.jpg
diff --git a/public/images/cards/63.jpg b/public/images/cards/63.jpg
diff --git a/public/images/cards/64.jpg b/public/images/cards/64.jpg
diff --git a/public/images/cards/65.jpg b/public/images/cards/65.jpg
diff --git a/public/images/cards/66.jpg b/public/images/cards/66.jpg
diff --git a/public/images/cards/67.jpg b/public/images/cards/67.jpg
diff --git a/public/images/cards/68.jpg b/public/images/cards/68.jpg
diff --git a/public/images/cards/69.jpg b/public/images/cards/69.jpg
diff --git a/public/images/cards/7.jpg b/public/images/cards/7.jpg
diff --git a/public/images/cards/70.jpg b/public/images/cards/70.jpg
diff --git a/public/images/cards/71.jpg b/public/images/cards/71.jpg
diff --git a/public/images/cards/72.jpg b/public/images/cards/72.jpg
diff --git a/public/images/cards/73.jpg b/public/images/cards/73.jpg
diff --git a/public/images/cards/74.jpg b/public/images/cards/74.jpg
diff --git a/public/images/cards/75.jpg b/public/images/cards/75.jpg
diff --git a/public/images/cards/76.jpg b/public/images/cards/76.jpg
diff --git a/public/images/cards/77.jpg b/public/images/cards/77.jpg
diff --git a/public/images/cards/8.jpg b/public/images/cards/8.jpg
diff --git a/public/images/cards/9.jpg b/public/images/cards/9.jpg
-Original file line number
+Diff line change
@@ Expand Up / @@ -23,7 +23,4 @@ dist-ssr @@
     *.sln
     *.sw?
     .env
-    .yarn/
-    install-state.gz
+    .yarn