From ee229cace567409e8b4caa276d300a5fd26c8708 Mon Sep 17 00:00:00 2001 From: Daniel Lugo Date: Mon, 19 Jul 2021 17:08:36 -0400 Subject: [PATCH] Remove merge artifacts --- services/gunDB/sockets/index.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/services/gunDB/sockets/index.js b/services/gunDB/sockets/index.js index 1166df21..883f370c 100644 --- a/services/gunDB/sockets/index.js +++ b/services/gunDB/sockets/index.js @@ -9,11 +9,7 @@ const uuidv4 = require('uuid/v4') const { getGun, getUser, isAuthenticated } = require('../Mediator') const { deepDecryptIfNeeded } = require('../rpc') const Subscriptions = require('./subscriptions') -<<<<<<< HEAD -const GunEvents = require('../contact-api/events') const GunActions = require('../../gunDB/contact-api/actions') -======= ->>>>>>> a8235aa... No hardcoded events in gun socket rpc const { encryptedEmit, encryptedOn,