ci: docker build cmd wip

chainbound · Jan 17, 2025 · 3199eae · 3199eae
1 parent 54eca75
commit 3199eae
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/.github/workflows/docker-build-cmd.yml b/.github/workflows/docker-build-cmd.yml
@@ -1,9 +1,13 @@
+<<<<<<< HEAD
 # .github/workflows/docker-build-on-comment.yml
 # This will only compile x86_64 docker images, NO CROSS-COMPILE!
 # NOTE: to make this work, this repository needs write access to the specific containers:
 # - bolt-sidecar
 # - bolt-boost
 # You can configure this in the package settings under Manage Actions access. Make sure to set "role" to "write".
+=======
+# .github/workflows/docker-build-cmd.yml
+>>>>>>> f88533f1 (ci: docker build cmd wip)
 name: Build Docker Image on Comment
 
 on: