fuxino/simple_backup
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Fix merge problem

Browse Source
This commit is contained in:
daniele 2017-06-23 12:21:09 +02:00
parent 71a2b6d01e
commit 97d1a14260
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
simple-backup
View File

@ -19,11 +19,7 @@
#Help function #Help function
function help_function { function help_function {
<<<<<<< HEAD
echo "simple_backup, version 1.3.4"
=======
echo "simple_backup, version 1.4" echo "simple_backup, version 1.4"
>>>>>>> development
echo "" echo ""
echo "Usage: $0 [OPTIONS]" echo "Usage: $0 [OPTIONS]"
echo "" echo ""