From f0cd0915ae535e6648f153f5b30368f9d9418a73 Mon Sep 17 00:00:00 2001
From: Marc Vertes <mvertes@free.fr>
Date: Tue, 21 Jan 2025 08:48:23 +0100
Subject: fixup

---
 .vimrc | 1 -
 1 file changed, 1 deletion(-)

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
-- 
cgit v1.2.3