make cards mergable

2022-09-08 17:14:07 +02:00 · 2022-09-08 17:14:07 +02:00 · 8ebc797a19
commit 8ebc797a19
parent e7663e91ca
6 changed files with 11 additions and 10 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -7,3 +7,4 @@
 *.gitignore filter=lfs diff=lfs merge=lfs -text
 *.gd filter=lfs diff=lfs merge=lfs -text
 *.tscn filter=lfs diff=lfs merge=lfs -text
 *.blend filter=lfs diff=lfs merge=lfs -text
--- a/src/Card.gd
+++ b/src/Card.gd
--- a/src/Card.tscn
+++ b/src/Card.tscn
--- a/src/DropZone.gd
+++ b/src/DropZone.gd
--- a/src/DropZone.tscn
+++ b/src/DropZone.tscn
--- a/src/Playfield.tscn
+++ b/src/Playfield.tscn