Browse Source

encoding/cbor: fix conflict

Laytan Laats 1 year ago
parent
commit
9a5f3fed8c
1 changed files with 0 additions and 1 deletions
  1. 0 1
      tests/core/Makefile

+ 0 - 1
tests/core/Makefile

@@ -51,7 +51,6 @@ noise_test:
 	$(ODIN) run math/noise $(COMMON) -out:test_noise
 	$(ODIN) run math/noise $(COMMON) -out:test_noise
 
 
 encoding_test:
 encoding_test:
-<<<<<<< HEAD
 	$(ODIN) run encoding/hxa    $(COMMON) $(COLLECTION) -out:test_hxa
 	$(ODIN) run encoding/hxa    $(COMMON) $(COLLECTION) -out:test_hxa
 	$(ODIN) run encoding/json   $(COMMON) -out:test_json
 	$(ODIN) run encoding/json   $(COMMON) -out:test_json
 	$(ODIN) run encoding/varint $(COMMON) -out:test_varint
 	$(ODIN) run encoding/varint $(COMMON) -out:test_varint