Compare commits
No commits in common. "af3606da16d7e607269436cea61b8686bfbc960c" and "00274fd0333fe8c95787df3a11cbeda3b72432a4" have entirely different histories.
af3606da16
...
00274fd033
4
build.sh
Executable file → Normal file
4
build.sh
Executable file → Normal file
@ -1,6 +1,2 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
<<<<<<< HEAD
|
|
||||||
docker build -t gitea.angoosh.com/meiri/alkator/api:latest .
|
docker build -t gitea.angoosh.com/meiri/alkator/api:latest .
|
||||||
=======
|
|
||||||
docker build -t gitea.angoosh.com/meiri/alkator/api:latest .
|
|
||||||
>>>>>>> 00274fd0333fe8c95787df3a11cbeda3b72432a4
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user