Update docker-image.yml

Author: f0cii

.github/workflows/docker-image.yml

@@ -22,8 +22,4 @@ jobs:
       run: git submodule update --init --recursive
 
     - name: Build the Docker image
-<<<<<<< HEAD
       run: docker build . --file moxt-cpp.Dockerfile --tag moxt-cpp:$(date +%s)
-=======
-      run: docker build . --file moxt-cpp.Dockerfile --tag moxt-cpp:$(date +%s)
->>>>>>> 15b530a (Update docker-image.yml)