Fixed Bugs

2023-12-27 01:04:36 +01:00
parent e3d4c26944 5794762dc9
commit d503358f0a
1031 changed files with 418065 additions and 0 deletions
@@ -1,4 +1,7 @@
+<<<<<<< HEAD
 # ---> Unity
+=======
+>>>>>>> 5794762dc91d1f0d42c77a434b28d24af5d5a080
 # This .gitignore file should be placed at the root of your Unity project directory
 #
 # Get latest from https://github.com/github/gitignore/blob/main/Unity.gitignore
@@ -71,4 +74,7 @@ crashlytics-build.properties
 # Temporary auto-generated Android Assets
 /[Aa]ssets/[Ss]treamingAssets/aa.meta
 /[Aa]ssets/[Ss]treamingAssets/aa/*
+<<<<<<< HEAD

+=======
+>>>>>>> 5794762dc91d1f0d42c77a434b28d24af5d5a080