From fecf26bc5fe30bcd2e954586397f9fd01d32ef01 Mon Sep 17 00:00:00 2001
From: Angoosh Leviocki <kaplanantonin@gmail.com>
Date: Thu, 24 Oct 2024 16:35:20 +0200
Subject: [PATCH] fx

---
 build.sh | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/build.sh b/build.sh
index 02e8bad..beadffe 100755
--- 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