merge conflict fix

smartcontractkit · May 22, 2024 · 83720aa · 83720aa
1 parent 7eb161c
commit 83720aa
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/Makefile b/Makefile
@@ -84,7 +84,6 @@ test_smoke:
 	cd ./integration-tests &&\
 	SELECTED_NETWORKS=SIMULATED go test -timeout 24h -count=1 -json $(args) -run TestSolanaOCRV2Smoke ./smoke 2>&1 | tee /tmp/gotest.log | gotestloghelper -json -tlogprefix -singlepackage -color
 
-	SELECTED_NETWORKS=SIMULATED go test -timeout 24h -count=1 -json $(args) ./soak 2>&1 | tee /tmp/gotest.log | gotestloghelper -json -tlogprefix -singlepackage -color
 gomodtidy:
 	go mod tidy
 	cd ./integration-tests && go mod tidy