filecoin-project/slate
1
1
Fork 0
mirror of https://github.com/filecoin-project/slate.git synced 2024-11-30 12:26:00 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix(lint): remove conflict flag

Browse Source 
Signed-off-by: Andrew Hill <andrew@textile.io>
This commit is contained in:
Andrew Hill 2020-09-22 14:37:05 -07:00
parent 157151ef57
commit 0cd90fce65
No known key found for this signature in database
GPG Key ID: B8929C9860377979
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
node_common/utilities.js
View File

@ -128,7 +128,6 @@ export const getBucketAPIFromUserToken = async (token, user) => {
const buckets = await Buckets.withKeyInfo(TEXTILE_KEY_INFO); const buckets = await Buckets.withKeyInfo(TEXTILE_KEY_INFO);
await buckets.getToken(identity); await buckets.getToken(identity);
<<<<<<< HEAD
// TODO(jim): Put this call into a file for all Textile related calls. // TODO(jim): Put this call into a file for all Textile related calls.
let target; let target;
console.log(`[buckets] getOrCreate`); console.log(`[buckets] getOrCreate`);