kuhyx/WUT_Computer_Science
1
0
Fork 0
mirror of https://github.com/kuhyx/WUT_Computer_Science.git synced 2026-07-06 12:43:16 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'kuchy-soldiers' into 'Development'

Browse Source 
Merge Soldiers

See merge request gskowron/eopsy-lab-567-project!3
This commit is contained in:
Krzysztof Stefan Rudnicki 2022-05-16 14:26:32 +02:00
commit b2f57b9e92
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
The project/Assets/Prefabs.meta
View File

@ -1,5 +1,9 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< HEAD
guid: 08cb4bdcfd1a3d9198e1d7ccfee220d2 guid: 08cb4bdcfd1a3d9198e1d7ccfee220d2
=======
guid: 5939f2b8303b5cd46afe044fb9d1709e
>>>>>>> 98112df (added TickSystem and an example tick receiver)
folderAsset: yes folderAsset: yes
DefaultImporter: DefaultImporter:
externalObjects: {} externalObjects: {}

4
The project/Assets/Scripts.meta
View File

@ -1,5 +1,9 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< HEAD
guid: c970975bb706c3e158e7748ebf7f5284 guid: c970975bb706c3e158e7748ebf7f5284
=======
guid: 0249b4cbd93f42540a182f30adbb10bc
>>>>>>> 98112df (added TickSystem and an example tick receiver)
folderAsset: yes folderAsset: yes
DefaultImporter: DefaultImporter:
externalObjects: {} externalObjects: {}