Fix merge problem
This commit is contained in:
@ -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 ""
|
||||
|
Reference in New Issue
Block a user