From 8ec4b742e2229c1383e45d7db573ed317601cf0a Mon Sep 17 00:00:00 2001 From: Mauro Lacy Date: Sun, 15 Dec 2024 16:37:36 +0100 Subject: [PATCH] Fix rebase error --- tests/testdata/version.txt | 8 -------- 1 file changed, 8 deletions(-) diff --git a/tests/testdata/version.txt b/tests/testdata/version.txt index 86fb18a..4a037da 100644 --- a/tests/testdata/version.txt +++ b/tests/testdata/version.txt @@ -1,9 +1 @@ -<<<<<<< HEAD -<<<<<<< HEAD 4e0214702fc01ebbbf0e966a88ac115726180a5b -======= -5f5ba8de0f04fc807a2c5683ab49235c8514cfc9 ->>>>>>> 6f087f7 (Revert "Update contracts from local") -======= -166fda9484fdb57019e2bffda7827e50d072b3cf ->>>>>>> bad0eeb (Update contracts from current main)