missed one

holepunchto · Nov 18, 2024 · 9250a35 · 9250a35
1 parent 4a9e874
commit 9250a35
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/test/replicate.js b/test/replicate.js
@@ -1,11 +1,7 @@
 const test = require('brittle')
 const b4a = require('b4a')
 const NoiseSecretStream = require('@hyperswarm/secret-stream')
-<<<<<<< HEAD
-const { create, createStored, replicate, unreplicate, eventFlush } = require('./helpers')
-=======
-const { create, replicate, unreplicate, eventFlush, replicateDebugStream } = require('./helpers')
->>>>>>> main
+const { create, createStored, replicate, unreplicate, eventFlush, replicateDebugStream } = require('./helpers')
 const { makeStreamPair } = require('./helpers/networking.js')
 const Hypercore = require('../')