summaryrefslogtreecommitdiff
path: root/.vimrc
diff options
context:
space:
mode:
authorMarc Vertes <mvertes@free.fr>2025-01-21 08:48:23 +0100
committerMarc Vertes <mvertes@free.fr>2025-01-21 08:48:23 +0100
commitf0cd0915ae535e6648f153f5b30368f9d9418a73 (patch)
tree7dd1c2d0e823600d31621c20c355b1aec09fd36e /.vimrc
parent0ad4e2b969c28d2b39d29e55e53ae632db710030 (diff)
fixup
Diffstat (limited to '.vimrc')
-rw-r--r--.vimrc1
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