From 9cc2f0b58229ea7007016a26ed4b085e44eb71b9 Mon Sep 17 00:00:00 2001 From: Chaim Lev-Ari Date: Mon, 25 Sep 2023 19:41:20 +0300 Subject: [PATCH] fix(docker/container): remove git conflicts --- app/docker/views/containers/create/createcontainer.html | 5 ----- 1 file changed, 5 deletions(-) diff --git a/app/docker/views/containers/create/createcontainer.html b/app/docker/views/containers/create/createcontainer.html index 4d0d7f700..68b79f36c 100644 --- a/app/docker/views/containers/create/createcontainer.html +++ b/app/docker/views/containers/create/createcontainer.html @@ -222,12 +222,7 @@
- <<<<<<< HEAD - - ======= - - >>>>>>> 26033115c (feat(containers): migrate labels tab to react [EE-5212])