ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-06-23 06:05:00 -07:00
Code Issues Packages Projects Releases Wiki Activity

encoding/cbor: fix conflict

Browse Source
This commit is contained in:
Laytan Laats
2024-03-04 17:26:49 +01:00
parent 04bd3cc525
commit 9a5f3fed8c
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/core/Makefile
-1
View File
@@ -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