From 7698adfd772c65a18e6a75dc4ab5348ebf01c831 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luis=20L=C3=B3pez?= <ldotlopez@gmail.com>
Date: Mon, 17 Feb 2020 09:31:45 +0100
Subject: [PATCH] Rebase on top of upstream/develop

---
 yadm | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/yadm b/yadm
index 250ae77..5995a15 100755
--- a/yadm
+++ b/yadm
@@ -1170,11 +1170,8 @@ yadm.auto-alt
 yadm.auto-exclude
 yadm.auto-perms
 yadm.auto-private-dirs
-<<<<<<< HEAD
-=======
 yadm.cygwin-copy
 yadm.cypher
->>>>>>> local
 yadm.git-program
 yadm.gpg-perms
 yadm.gpg-program