SHIBUI-914 Fixed merge conflict

TIER · Oct 4, 2018 · 5d8dbfa · 5d8dbfa
2 parents 3e1a499 + c820640
commit 5d8dbfa
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/ui/src/app/app.module.ts b/ui/src/app/app.module.ts
@@ -61,7 +61,6 @@ import { CustomWidgetRegistry } from './schema-form/registry';
     ],
     providers: [
         NavigatorService,
-        { provide: WidgetRegistry, useClass: CustomWidgetRegistry },
         { provide: RouterStateSerializer, useClass: CustomRouterStateSerializer },
         {
             provide: HTTP_INTERCEPTORS,

diff --git a/ui/src/assets/schema/source/metadata-source.json b/ui/src/assets/schema/source/metadata-source.json
@@ -262,7 +262,7 @@
                             "enum": [
                                 "support"
                             ],
-                            "description": "value.support" 
+                            "description": "value.support"
                         },
                         {
                             "enum": [
@@ -434,7 +434,6 @@
                             "description": "urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
                         }
                     ]
-
                 }
             }
         }