Skip to content

Commit ad17717

Browse files
authored
fix: solve v4 merge conflict (#424)
#423
1 parent 345b5ac commit ad17717

File tree

3 files changed

+184
-217
lines changed

3 files changed

+184
-217
lines changed

bin/smee.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,7 @@ Options:
5959
options;
6060

6161
async function setup() {
62-
<<<<<<< HEAD
6362
const source = options.url || (await Client.createChannel());
64-
=======
65-
const source = options.url ?? (await Client.createChannel());
66-
>>>>>>> parent of 4426ffa (feat: add new `query-forwarding` option, refactor code to allow `onopen`, `onerror` and `onmessage` overridable (#382))
6763

6864
const client = new Client({ source, target });
6965
client.start();

0 commit comments

Comments
 (0)