From 54e232bf8b0668edc601763c4ed60be8fffc40a3 Mon Sep 17 00:00:00 2001
From: Marvin Borner
Date: Mon, 21 Sep 2020 16:07:38 +0200
Subject: Laptop sync

---
 .gitconfig | 2 --
 1 file changed, 2 deletions(-)

(limited to '.gitconfig')

diff --git a/.gitconfig b/.gitconfig
index 056e73c..d582072 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -6,5 +6,3 @@
 	ff = only
 [commit]
 	gpgsign = true
-[merge]
-	tool = vimdiff
-- 
cgit v1.2.3