Skip to content

Commit

Permalink
Handle merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@davecreaser
davecreaser committed Jun 3, 2024
1 parent 2d0e56e commit e210685
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion docker/colony-cdapp-dev-env-block-ingestor
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM colony-cdapp-dev-env/base:latest

ENV BLOCK_INGESTOR_HASH=bff932df97e79203f644960dce6c0793cd0acf44
ENV BLOCK_INGESTOR_HASH=349808f59068ada6cabe20f6cd7b85941f7924e3

# Declare volumes to set up metadata
VOLUME [ "/colonyCDapp/amplify/mock-data" ]
Expand Down

0 comments on commit e210685

Please sign in to comment.