From 79258d3a8d8223582cac16d0c8591e2f05369e2a Mon Sep 17 00:00:00 2001 From: Iuri Matias Date: Wed, 21 Aug 2019 11:57:32 -0400 Subject: [PATCH] fix rebase issue --- src/eventSyncer.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/eventSyncer.js b/src/eventSyncer.js index b398edb..4c115c3 100644 --- a/src/eventSyncer.js +++ b/src/eventSyncer.js @@ -1,10 +1,7 @@ const { fromEvent, interval, ReplaySubject } = require('rxjs'); const { throttle, distinctUntilChanged } = require('rxjs/operators'); const { randomString } = require('./utils.js'); -<<<<<<< HEAD -======= ->>>>>>> refactor eventSyner const Database = require('./database.js'); const Events = require('events'); const Web3 = require('web3');