From 04d3b559322297ce3e13cd5d53914a5d8bbdf069 Mon Sep 17 00:00:00 2001
From: Iuri Matias <iuri.matias@gmail.com>
Date: Tue, 20 Aug 2019 14:14:55 -0400
Subject: [PATCH] refactor eventSyner

---
 src/eventSyncer.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/eventSyncer.js b/src/eventSyncer.js
index 4c115c3..b398edb 100644
--- a/src/eventSyncer.js
+++ b/src/eventSyncer.js
@@ -1,7 +1,10 @@
 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');