From 29f90ceb08febd71c39453f42eb4eb03a18b9206 Mon Sep 17 00:00:00 2001 From: Evan Palmer Date: Thu, 15 Aug 2024 11:39:32 -0700 Subject: [PATCH] Fix merge conflicts --- .github/workflows/docker.yml | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 98b9a85..e4d1b0d 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -45,11 +45,7 @@ jobs: type=raw,value=${{ matrix.ROS_DISTRO }}-${{ github.job }} - name: Build and push Docker image -<<<<<<< HEAD - uses: docker/build-push-action@v5.4.0 -======= uses: docker/build-push-action@v6.6.1 ->>>>>>> 474bf8c (Bump docker/build-push-action from 6.5.0 to 6.6.1 (#25)) with: context: . file: .docker/Dockerfile @@ -96,11 +92,7 @@ jobs: type=raw,value=${{ matrix.ROS_DISTRO }}-${{ github.job }} - name: Build and push Docker image -<<<<<<< HEAD - uses: docker/build-push-action@v5.4.0 -======= uses: docker/build-push-action@v6.6.1 ->>>>>>> 474bf8c (Bump docker/build-push-action from 6.5.0 to 6.6.1 (#25)) with: context: . file: .docker/Dockerfile @@ -142,11 +134,7 @@ jobs: type=raw,value=${{ matrix.ROS_DISTRO }}-${{ github.job }} - name: Build and push Docker image -<<<<<<< HEAD - uses: docker/build-push-action@v5.4.0 -======= uses: docker/build-push-action@v6.6.1 ->>>>>>> 474bf8c (Bump docker/build-push-action from 6.5.0 to 6.6.1 (#25)) with: context: . file: .docker/Dockerfile @@ -187,11 +175,7 @@ jobs: type=raw,value=${{ matrix.ROS_DISTRO }}-${{ github.job }} - name: Build and push Docker image -<<<<<<< HEAD - uses: docker/build-push-action@v5.4.0 -======= uses: docker/build-push-action@v6.6.1 ->>>>>>> 474bf8c (Bump docker/build-push-action from 6.5.0 to 6.6.1 (#25)) with: context: . file: .docker/Dockerfile