fx

2024-10-24 16:35:20 +02:00 · 2024-10-24 16:35:20 +02:00 · fecf26bc5f
commit fecf26bc5f
parent af3606da16
1 changed files with 0 additions and 4 deletions
--- a/build.sh
+++ b/build.sh
@ -1,6 +1,2 @@
 #!/bin/bash
-<<<<<<< HEAD
 docker build -t gitea.angoosh.com/meiri/alkator/api:latest .
-=======
-docker build -t gitea.angoosh.com/meiri/alkator/api:latest .
->>>>>>> 00274fd0333fe8c95787df3a11cbeda3b72432a4