yeahweregames/UnityTowerDefense
4
0
Fork 0
Code Issues Pull requests Projects 1 Releases Packages Wiki Activity Actions

fix merge conflicts

Browse source
This commit is contained in:
Ian Woods 2026-06-23 20:38:32 -07:00
parent 8f394e1d92
commit 92f7dc5a3b
1 changed files with 0 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Assets/_Project/Definitions.meta
View file

@ -1,9 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< HEAD
guid: 01de85ee5d8a2014594d9910b1a6ff55
=======
guid: cf294cbfb17f5a5d7846479a116fc7b3 guid: cf294cbfb17f5a5d7846479a116fc7b3
>>>>>>> 31b0b5f (adding uncommited files (oops))
folderAsset: yes folderAsset: yes
DefaultImporter: DefaultImporter:
externalObjects: {} externalObjects: {}