SHIBUI-701 Resolved merge conflicts

TIER · Nov 5, 2018 · c160bf9 · c160bf9
2 parents 9072bb6 + 47d65b3
commit c160bf9
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/ui/src/app/metadata/provider/model/file-backed-http.provider.form.spec.ts b/ui/src/app/metadata/provider/model/file-backed-http.provider.form.spec.ts
@@ -113,8 +113,8 @@ describe('FileBackedHttpMetadataProviderWizard', () => {
             expect(Object.keys(getValidators([]))).toEqual([
                 '/',
                 '/name',
-                '/metadataURL',
-                '/xmlId'
+                '/xmlId',
+                '/metadataURL'
             ]);
         });
     });