aiolabs/lightning-pub
2
0
Fork 0
Code Issues 9 Pull requests 4 Projects Releases Packages Wiki Activity Actions

Remove merge artifacts

Browse source
This commit is contained in:
Daniel Lugo 2021-07-19 17:08:36 -04:00
parent 45eeb2d672
commit ee229cace5
1 changed files with 0 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
services/gunDB/sockets/index.js
View file

@ -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,