Skip to content

Commit

Permalink
Fix rebase error
Browse files Browse the repository at this point in the history
  • Loading branch information
maurolacy committed Dec 15, 2024
1 parent 1d47dd1 commit 8ec4b74
Showing 1 changed file with 0 additions and 8 deletions.
8 changes: 0 additions & 8 deletions tests/testdata/version.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1 @@
<<<<<<< HEAD
<<<<<<< HEAD
4e0214702fc01ebbbf0e966a88ac115726180a5b
=======
5f5ba8de0f04fc807a2c5683ab49235c8514cfc9
>>>>>>> 6f087f7 (Revert "Update contracts from local")
=======
166fda9484fdb57019e2bffda7827e50d072b3cf
>>>>>>> bad0eeb (Update contracts from current main)

0 comments on commit 8ec4b74

Please sign in to comment.