Auto stash before merge of "main" and "origin/main"

4 years ago · 527c3c51b6
parent 021e6ccd9f
commit 527c3c51b6
1 changed files with 4 additions and 0 deletions
--- a/MuseumGame/Assets/Sprites/Paint
+++ b/MuseumGame/Assets/Sprites/Paint
@ -1,5 +1,9 @@
 fileFormatVersion: 2
+<<<<<<< Updated upstream
 guid: 91aa6c120a1f8d64d942204b2b6a6952
+=======
+guid: 99b222e3befa2bc4397d9c88480e9be8
+>>>>>>> Stashed changes
 TextureImporter:
  internalIDToNameTable: []
  externalObjects: {}