Compare commits

..

No commits in common. "af3606da16d7e607269436cea61b8686bfbc960c" and "00274fd0333fe8c95787df3a11cbeda3b72432a4" have entirely different histories.

2 changed files with 1 additions and 7 deletions

6
build.sh Executable file → Normal file
View File

@ -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
docker build -t gitea.angoosh.com/meiri/alkator/api:latest .

2
push.sh Executable file → Normal file
View File

@ -1,2 +0,0 @@
#!/bin/bash
docker push gitea.angoosh.com/meiri/alkator/api:latest