From e35def944a3689c7e41f6423dac5982fff3f1a81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcin=20Wo=C5=BAniak?=
 <marcin.wozniak@wundermanthompson.com>
Date: Sun, 12 Dec 2021 22:05:59 +0100
Subject: [PATCH] Resolved confict

---
 .config/nvim/init.vim | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index 22a490d..c5ae800 100644
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -270,7 +270,6 @@ vnoremap <A-k> :m '<-2<CR>gv=gv
 " Better replace
 nnoremap <Leader>s :%s//g<Left><Left>
 vnoremap <Leader>s :s//g<Left><Left>
->>>>>>> 15f37be93fd5e33bc2274210627d19822ef6ea38
 
 " Better adding into begging and ending line
 vnoremap F <C-v>$A