CommitLog |

2020-07-22 14:26:46 +12:00 · 2020-07-22 14:26:46 +12:00 · 55e56f1c2e
parent 6fd275a61e
commit 55e56f1c2e
1 changed files with 0 additions and 4 deletions
--- 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>