From cb91253745a268b93e5c3a5d095cea4c9beb72df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josu=C3=A9=20Tille?= <josue@tille.ch>
Date: Tue, 23 May 2017 09:56:19 +0200
Subject: [PATCH] Merge upstream

---
 scripts/_common.sh | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index 89c70ce..4f35e29 100755
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -1,13 +1,8 @@
 #!/bin/bash
 
 ## Adapt md5sum while you update app
-<<<<<<< HEAD
 md5sum="c4497b86b75d283ce978f07d5c6b2b0e"
 verctor_version="0.9.10"
-=======
-md5sum="f87717d87099267295081895d968e0c2"
-verctor_version="0.9.9"
->>>>>>> upstream/master
 
 init_script() {
     # Exit on command errors and treat unset variables as an error