From 647eeb40b3cb9afa20050147ddda473761551445 Mon Sep 17 00:00:00 2001 From: Lenz Date: Thu, 30 Apr 2020 22:10:03 +0200 Subject: [PATCH] fixing readme --- README.txt | 8 +------- bin/Brick.class | Bin 450 -> 450 bytes bin/Game.class | Bin 3615 -> 3615 bytes bin/Ghost.class | Bin 884 -> 884 bytes bin/Main.class | Bin 558 -> 558 bytes bin/Map.class | Bin 1968 -> 1968 bytes bin/Picture.class | Bin 1415 -> 1415 bytes bin/Player.class | Bin 3510 -> 3510 bytes 8 files changed, 1 insertion(+), 7 deletions(-) diff --git a/README.txt b/README.txt index a60e789..45fba2f 100644 --- 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 \ No newline at end of file +About to add Path finding for the Ghosts and an A.I. that controlss Pac-Man. \ No newline at end of file diff --git a/bin/Brick.class b/bin/Brick.class index 98f1c69aeacb64cc67c5adfd0911ce8b54b732c9..50ef0edbf9e3ab3e130be745f874a171441c4509 100644 GIT binary patch delta 17 ZcmX@ae2AIj)W2Q(7#J8VH*)M^1OPzQ27mwn delta 17 ZcmX@ae2AIj)W2Q(7#J8#HgfD@1OPz1273Si diff --git a/bin/Game.class b/bin/Game.class index 70373b01bd8d9e466587d8c5649646fc5685ff47..90138455c5c30efa5142e996e3bb3357bb52b4a2 100644 GIT binary patch delta 17 ZcmbO)Ghc?|)W2Q(7#J8VH*$#c0RTQK1=aun delta 17 ZcmbO)Ghc?|)W2Q(7#J8#Hgbsb0RTP`15cc1_lPpjU4r?06Fso;{X5v delta 17 YcmZqYZs+DW^>5cc1_lO`jU4r?06E$P-T(jq diff --git a/bin/Player.class b/bin/Player.class index 702cafc5f61810a3a154d75d8e94499c4ed3491f..b5fa448688f1fdefe0426cbeedbba754639ffa0f 100644 GIT binary patch delta 17 Zcmdlcy-k|q)W2Q(7#J8VH*&1w1pq=B2ABW< delta 17 Zcmdlcy-k|q)W2Q(7#J8#Hgc@v1pq<-29p2)