From ff3b5b0ceff76630e8bbb9471e3bc08506f8f2cf Mon Sep 17 00:00:00 2001 From: George Kudrayvtsev Date: Thu, 15 Apr 2021 16:47:34 -0400 Subject: [PATCH] Fix bad rebase --- test/unit/server_test.js | 36 ++++++++---------------------------- 1 file changed, 8 insertions(+), 28 deletions(-) diff --git a/test/unit/server_test.js b/test/unit/server_test.js index 797b42527..26b1cdb06 100644 --- a/test/unit/server_test.js +++ b/test/unit/server_test.js @@ -3168,15 +3168,10 @@ describe('server.js non-transaction tests', function() { flags: { auth_required: false, auth_revocable: false, -<<<<<<< HEAD - }, - }, -======= auth_immutable: false, auth_clawback_enabled: false - } - } ->>>>>>> c2914590 (Add new flags to the expected account response) + }, + }, ] } }; @@ -3250,15 +3245,10 @@ describe('server.js non-transaction tests', function() { flags: { auth_required: false, auth_revocable: false, -<<<<<<< HEAD - }, - }, -======= auth_immutable: false, auth_clawback_enabled: false - } - } ->>>>>>> c2914590 (Add new flags to the expected account response) + }, + }, ] } }; @@ -3334,15 +3324,10 @@ describe('server.js non-transaction tests', function() { flags: { auth_required: false, auth_revocable: false, -<<<<<<< HEAD - }, - }, -======= auth_immutable: false, auth_clawback_enabled: false - } - } ->>>>>>> c2914590 (Add new flags to the expected account response) + }, + }, ] } }; @@ -3417,15 +3402,10 @@ describe('server.js non-transaction tests', function() { flags: { auth_required: true, auth_revocable: true, -<<<<<<< HEAD + auth_immutable: false, + auth_clawback_enabled: false }, }, -======= - auth_immutable: false, - auth_clawback_enabled: false - } - } ->>>>>>> c2914590 (Add new flags to the expected account response) ] } };