Wip update test vectors

2026-02-06 18:56:43 +01:00 · 2019-05-08 16:29:25 +02:00
parent d7f7243239 5b7abbc4ec
commit 74a7e71c33
1 changed files with 3 additions and 0 deletions
--- a/test/smttestvectors.js
+++ b/test/smttestvectors.js
@@ -140,5 +140,8 @@ describe("[sparse-merkle-tree] Javascript test", function () {
        
        expect(bytesToHex(root1)).to.be.equal("0x27990ef22656f49f010b2b48b2418c46f2bc93e4afb2e3377a1eb09f129e9802");
    });
+<<<<<<< HEAD
    */
+=======
+>>>>>>> 5b7abbc4ec56447e5e2baa31e3b4ce3a0c0617a8
 });