From 97d1a1426071972129aa17e39dc227e7fefe09f1 Mon Sep 17 00:00:00 2001
From: Fuxino <dfucini@gmail.com>
Date: Fri, 23 Jun 2017 12:21:09 +0200
Subject: [PATCH] Fix merge problem

---
 simple-backup | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/simple-backup b/simple-backup
index 5dd24db..881c22f 100755
--- a/simple-backup
+++ b/simple-backup
@@ -19,11 +19,7 @@
 
 #Help function
 function help_function {
-<<<<<<< HEAD
-   echo "simple_backup, version 1.3.4"
-=======
    echo "simple_backup, version 1.4"
->>>>>>> development
    echo ""
    echo "Usage: $0 [OPTIONS]"
    echo ""