fixup: merge conflict

Signed-off-by: Lance Ball <[email protected]>
lance · Sep 4, 2024 · c39f88b · c39f88b
1 parent 8a4ff6a
commit c39f88b
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/Dockerfile.ctfe_init b/Dockerfile.ctfe_init
@@ -13,11 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-<<<<<<< HEAD
-FROM golang:1.22.5@sha256:86a3c48a61915a8c62c0e1d7594730399caa3feb73655dfe96c7bc17710e96cf AS builder
-=======
 FROM golang:1.23.0@sha256:613a108a4a4b1dfb6923305db791a19d088f77632317cfc3446825c54fb862cd AS builder
->>>>>>> 123e39c (Update golang Docker tag to v1.23.0 (#165))
 
 WORKDIR /root/