From 9a5f3fed8c89bccededf80308c7c6213ae760792 Mon Sep 17 00:00:00 2001 From: Laytan Laats Date: Mon, 4 Mar 2024 17:26:49 +0100 Subject: [PATCH] encoding/cbor: fix conflict --- tests/core/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/core/Makefile b/tests/core/Makefile index 3fa38cd34..6c5df7f66 100644 --- a/tests/core/Makefile +++ b/tests/core/Makefile @@ -51,7 +51,6 @@ noise_test: $(ODIN) run math/noise $(COMMON) -out:test_noise encoding_test: -<<<<<<< HEAD $(ODIN) run encoding/hxa $(COMMON) $(COLLECTION) -out:test_hxa $(ODIN) run encoding/json $(COMMON) -out:test_json $(ODIN) run encoding/varint $(COMMON) -out:test_varint