From a1ed2d390b460ff923947de9648eca90a9b2dc6b Mon Sep 17 00:00:00 2001
From: Vasil Zlatanov <vasil.zlatanov@gmail.com>
Date: Wed, 7 Dec 2016 01:34:49 +0000
Subject: khard nvim update

---
 DAV/khard.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DAV/khard.conf b/DAV/khard.conf
index 76b0c32..4765558 100644
--- a/DAV/khard.conf
+++ b/DAV/khard.conf
@@ -9,7 +9,7 @@ path = ~/.contacts/default/
 debug = no
 default_action = list
 editor = nvim
-merge_editor = vimdiff
+merge_editor = nvimdiff
 
 [contact table]
 # display names by first or last name: first_name / last_name
-- 
cgit v1.2.3-54-g00ecf