From e210685b052d62bd8ce64f35cac4e5bba6826abb Mon Sep 17 00:00:00 2001 From: Dave Creaser Date: Mon, 3 Jun 2024 13:07:44 +0100 Subject: [PATCH] Handle merge conflicts --- docker/colony-cdapp-dev-env-block-ingestor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/colony-cdapp-dev-env-block-ingestor b/docker/colony-cdapp-dev-env-block-ingestor index 4d2cf38e99..819a552300 100644 --- a/docker/colony-cdapp-dev-env-block-ingestor +++ b/docker/colony-cdapp-dev-env-block-ingestor @@ -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" ]