Resolve merge conflicts

This commit is contained in:
Eitan Seri- Levi
2026-02-03 20:52:44 -08:00
parent 1e69734e18
commit 96d02ad93d

View File

@@ -1,10 +1,6 @@
# To download/extract nightly tests, run:
# CONSENSUS_SPECS_TEST_VERSION=nightly make
<<<<<<< HEAD
CONSENSUS_SPECS_TEST_VERSION ?= nightly-21573464110
=======
CONSENSUS_SPECS_TEST_VERSION ?= v1.7.0-alpha.2
>>>>>>> 1dd0f7bcbb9e476028ec9146a149e121ad28ff9e
REPO_NAME := consensus-spec-tests
OUTPUT_DIR := ./$(REPO_NAME)