fix

smartcontractkit · Oct 10, 2024 · f4f365d · f4f365d
1 parent 59b42c6
commit f4f365d
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/shell.nix b/shell.nix
@@ -57,11 +57,7 @@ in
       mkdir -p $GOBIN
       export PATH=$GOBIN:$PATH
       # install gotestloghelper
-<<<<<<< Updated upstream
       # TODO restore latest after versioning is fixed
       go install github.com/smartcontractkit/chainlink-testing-framework/tools/gotestloghelper@bb160ff1069a807693b2c76691c55cb17959fbb5
-=======
-      go install github.com/smartcontractkit/chainlink-testing-framework/tools/gotestloghelper@latest
->>>>>>> Stashed changes
     '';
   }