From 55e56f1c2e15dd7d3dae915066822e68b1e8be22 Mon Sep 17 00:00:00 2001
From: SilicaAndPina <earsyum@gmail.com>
Date: Wed, 22 Jul 2020 14:26:46 +1200
Subject: [PATCH] CommitLog |

---
 Spaceinator.project.gmx | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Spaceinator.project.gmx b/Spaceinator.project.gmx
index 94944bf..b85b6d4 100644
--- a/Spaceinator.project.gmx
+++ b/Spaceinator.project.gmx
@@ -9,10 +9,6 @@
     <sprite>sprites\spr_player</sprite>
     <sprite>sprites\spr_blocks</sprite>
     <sprite>sprites\spr_blackhole</sprite>
-<<<<<<< HEAD
-=======
-    <sprite>sprites\enemyship1</sprite>
->>>>>>> 7c676d7f28dbde26a75d5dff7a9209fd8c88d3b9
   </sprites>
   <backgrounds name="background">
     <background>background\bg_space</background>