Merge conflict cleanup

near · Apr 23, 2020 · 80ff9d2 · 80ff9d2
1 parent 4df2336
commit 80ff9d2
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/commands/create-account.js b/commands/create-account.js
@@ -32,13 +32,9 @@ module.exports = {
 };
 
 async function createAccount(options) {
-<<<<<<< HEAD
     await eventtracking.track(eventtracking.EVENT_ID_CREATE_ACCOUNT_START, {});
     options.initialBalance = utils.format.parseNearAmount(options.initialBalance);
-    // NOTE: initialBalance is passed as part of config here
-=======
     // NOTE: initialBalance is passed as part of config here, parsed in middleware/initial-balance
->>>>>>> master
     let near = await connect(options);
     let keyPair;
     let publicKey;