From cab3a83df6a07137a514e3c01e23688c6a8174d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Filip=20Bure=C5=A1?=
<114904886+PhilipBuresh@users.noreply.github.com>
Date: Sun, 24 Nov 2024 12:12:00 +0100
Subject: [PATCH] Update README.md
---
README.md | 25 +------------------------
1 file changed, 1 insertion(+), 24 deletions(-)
diff --git a/README.md b/README.md
index 9e5a4b1..8b13789 100644
--- a/README.md
+++ b/README.md
@@ -1,24 +1 @@
-<<<<<<< HEAD
-# Leap-and-Run
-[Play!](https://philipburesh.github.io/Leap-and-Run/)
-FULL VERSION (1.0)
---------------------------------------------------------------------
- - You must complete the level before the door closes.
---------------------------------------------------------------------
- - TIMER Added
- - Now you can use ORB multiple times
- - Better Jumping ("w" press) detection
- - Better Crouching ("s" press) detection
- - Remade some maps
- - Ladder Animation Fixed
- - SFX Fixed
- - Stucking in a Wall Fixed
- - Player Movement Fixed
- - Boss 1 hit bug fixed
- --------------------------------------------------------------------
-![player_an](https://github.com/PhilipBuresh/Leap-and-Run/assets/114904886/c5094b69-b54d-4cf5-a6b2-c2112b94bd09)
-![output-onlinegiftools](https://github.com/PhilipBuresh/Leap-and-Run/assets/114904886/3f542c81-fdb6-4717-821a-9dbf8fa37242)
-![output-onlinegiftools (1)](https://github.com/PhilipBuresh/Leap-and-Run/assets/114904886/c9052834-06c6-471e-b6b7-6424205927d9)
-=======
-# testing
->>>>>>> 6e3c43097e39e6bbd06e12d3341b8fcad86a5b17
+