Update dea-docker-image.yml

Author: martabica

.github/workflows/dea-docker-image.yml

@@ -28,8 +28,4 @@ jobs:
         context: ./dea    
         file: ./dea/Dockerfile  
         push: true
-<<<<<<< HEAD
-        tags: ${{ secrets.DOCKERHUB_MB_USERNAME }}/scstudio-dea:1.3
-=======
         tags: ${{ secrets.DOCKERHUB_MB_USERNAME }}/scstudio-dea:1.4
->>>>>>> 8d5dffa784b6ba4ae81892ad47d658eb039b04de