fixing readme

2020-04-30 22:10:03 +02:00 · 2020-04-30 22:10:03 +02:00 · 647eeb40b3
parent 78d0a33fe1
commit 647eeb40b3
8 changed files with 1 additions and 7 deletions
--- a/README.txt
+++ b/README.txt
@ -1,9 +1,3 @@
 A simple Pac-Man clone.
 So far.
-<<<<<<< HEAD
 About to add Path finding for the Ghosts and an A.I. that controlss Pac-Man.
-blebblobr5ft6z7 vjn
-=======
-About to add Path finding for the Ghosts and an A.I. that controls Pac-Man.
->>>>>>> 9346a1e20864c03e995f940f6aae6ec2aac5a4c9
-jzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz
--- a/bin/Brick.class
+++ b/bin/Brick.class
--- a/bin/Game.class
+++ b/bin/Game.class
--- a/bin/Ghost.class
+++ b/bin/Ghost.class
--- a/bin/Main.class
+++ b/bin/Main.class
--- a/bin/Map.class
+++ b/bin/Map.class
--- a/bin/Picture.class
+++ b/bin/Picture.class
--- a/bin/Player.class
+++ b/bin/Player.class