From 527c3c51b6509b8bbf2f327fe6b370f7715ec086 Mon Sep 17 00:00:00 2001
From: thoopchuk26 <thoopchuk@gmail.com>
Date: Thu, 15 Apr 2021 09:45:01 -0500
Subject: [PATCH] Auto stash before merge of "main" and "origin/main"

---
 MuseumGame/Assets/Sprites/Paint Projectile.png.meta | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/MuseumGame/Assets/Sprites/Paint Projectile.png.meta b/MuseumGame/Assets/Sprites/Paint Projectile.png.meta
index 12155b6..6d7ae4d 100644
--- a/MuseumGame/Assets/Sprites/Paint Projectile.png.meta	
+++ b/MuseumGame/Assets/Sprites/Paint Projectile.png.meta	
@@ -1,5 +1,9 @@
 fileFormatVersion: 2
+<<<<<<< Updated upstream
 guid: 91aa6c120a1f8d64d942204b2b6a6952
+=======
+guid: 99b222e3befa2bc4397d9c88480e9be8
+>>>>>>> Stashed changes
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}