[elpa] scratch/add-vdiff 8aa5c45 250/258: vdiff-magit: Fix paren

[Justin Burkett]

branch: scratch/add-vdiff
commit 8aa5c4591976e37773a655315dbff8492534283c
Author: Justin Burkett <address@hidden>
Commit: Justin Burkett <address@hidden>

    vdiff-magit: Fix paren
---
 vdiff-magit.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vdiff-magit.el b/vdiff-magit.el
index 80ef977..5743f17 100644
--- a/vdiff-magit.el
+++ b/vdiff-magit.el
@@ -118,7 +118,7 @@ conflicts, including those already resolved by Git, use
                                   (car (member current unmerged))))))
   (if vdiff-magit-use-ediff-for-merges
       (magit-ediff-resolve file)
-    (vdiff-merge-conflict file))))
+    (vdiff-merge-conflict file)))
 
 ;;;###autoload
 (defun vdiff-magit-stage (file)