chore: resolve merge conflict

andhreljaKern · andhreljaKern · commit 1cdb1325853b · 2025-01-07T10:16:42.000+01:00
diff --git a/dc/registry_delete.sh b/dc/registry_delete.sh
@@ -1,11 +1,8 @@
 # !/bin/bash
-<<<<<<< HEAD
-=======
 
 trap "exit 1" TERM
 export TOP_PID=$$
 
->>>>>>> b63724af1a7542546a7f1694f540e0015d447a62
 set -e
 
 ENVIRONMENT_NAME="dev"
