Skip to content

Commit

Permalink
Fixed conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@giulio-giunta
giulio-giunta committed Jan 1, 2024
1 parent e080cdd commit 4472ec0
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions .circleci/config.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,7 @@ jobs:
deploy-test:
docker:
<<<<<<< HEAD
- image: "geekzone/infra:0.1.413"
=======
- image: "geekzone/infra:0.1.410"
>>>>>>> main
environment:
TAG: 0.1.<< pipeline.number >>
steps:
Expand Down

0 comments on commit 4472ec0

Please sign in to comment.