From 25405d6130f9430c1979294f2c70c094d4c9557b Mon Sep 17 00:00:00 2001
From: kankys <email@lukaskanka.cz>
Date: Wed, 16 Oct 2024 16:48:01 +0200
Subject: [PATCH] =?UTF-8?q?readme=2014=20=C3=BAprava?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 readme/14. Inline Paramaters alernative  Neovim.md | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/readme/14. Inline Paramaters alernative  Neovim.md b/readme/14. Inline Paramaters alernative  Neovim.md
index 6d33987..639e8f5 100644
--- a/readme/14. Inline Paramaters alernative  Neovim.md	
+++ b/readme/14. Inline Paramaters alernative  Neovim.md	
@@ -1,5 +1,2 @@
-<<<<<<< HEAD
 # OMLOUVÁME SE STRÁNKA SE PŘEDĚLÁVÁ
-=======
-# OMLOUVÁME SE NA STRÁNCE PRACUJEME
->>>>>>> two
+