Clean-up 🧹

2021-03-12 13:13:17 +02:00
parent 499c08c374
commit af52ba1fec
2 changed files with 2 additions and 6 deletions
--- a/6
+++ b/6
@ -1739,11 +1739,7 @@ abra() {
    abra___secrets abra___status abra___no_tty abra___app_name \
    abra__subcommands_ abra___skip_update abra___skip_check \
    abra__backup_file_ abra___verbose abra___debug abra___help \
-<<<<<<< HEAD
-    abra___update abra___branch abra___volumes abra__provider_
-=======
-    abra___update abra___branch abra___volumes abra___type
->>>>>>> 1fa2de4... Add --type filter to `abra <app> ls`
+    abra___update abra___branch abra___volumes abra__provider_ abra___type

  if ! type tput > /dev/null 2>&1; then
    tput() {