1 files changed, 0 insertions, 1 deletions

diff --git a/.vimrc b/.vimrc
index dc87c60..2a38d2b 100644
--- a/.vimrc
+++ b/.vimrc
@@ -4,7 +4,6 @@
 set ls=1 ruler
 set ai ts=4 sw=4 noet
 " Not a good idea to activate mouse, as it disables cut & paste in MacOS
->>>>>>> 6d506e0b30569c547f41f6d6334a1b5133774da4
 "set mouse=a
 syntax off
 filetype on