remove merge leftovers
continuous-integration/drone/push Build is passing Details

This commit is contained in:
knoflook 2023-01-21 11:51:35 +01:00
parent f88255476f
commit 452e40fd30
1 changed files with 0 additions and 4 deletions

View File

@ -1,7 +1,4 @@
<<<<<<< HEAD
export APP_ENTRYPOINT_VERSION=v1
||||||| parent of 87367d9 (add backup capability)
=======
APP_DIR="app:/data"
_backup_app() {
@ -29,4 +26,3 @@ abra_backup_app() {
_backup_app $APP_DIR
success "Backed up 'app' to $ARK_FILENAME"
}
>>>>>>> 87367d9 (add backup capability)