Fixing merge conflicts

This commit is contained in:
Chris Troutner
2022-06-21 15:56:38 -07:00
12 changed files with 5515 additions and 5866 deletions
+3 -1
View File
@@ -98,5 +98,7 @@ module.exports = {
ipfsHost: process.env.IPFS_HOST ? process.env.IPFS_HOST : 'localhost',
ipfsApiPort: process.env.IPFS_API_PORT
? parseInt(process.env.IPFS_API_PORT)
: 5001
: 5001,
chatPubSubChan: 'psf-ipfs-chat-001'
}