include universal app

Author: andrewseguin

src/universal-app/BUILD.bazel

@@ -46,7 +46,6 @@ sass_binary(
         "external/npm/node_modules",
     ],
     deps = [
-        "//src/material-experimental/mdc-slider:mdc_slider_scss_lib",
         "//src/material-experimental/mdc-theming:all_themes",
         "//src/material-experimental/mdc-typography:all_typography",
         "//src/material/core:theming_scss_lib",

src/universal-app/theme.scss

@@ -1,5 +1,8 @@
 @import '../material/core/theming/all-theme';
+<<<<<<< HEAD
 @import '../material-experimental/mdc-slider/slider-theme';
+=======
+>>>>>>> include universal app
 @import '../material-experimental/mdc-theming/all-theme';
 @import '../material-experimental/mdc-typography/all-typography';
 
@@ -19,4 +22,3 @@ $candy-app-theme: mat-light-theme($candy-app-primary, $candy-app-accent);
 // Include the default theme styles.
 @include angular-material-theme($candy-app-theme);
 @include angular-material-theme-mdc($candy-app-theme);
-@include mat-slider-theme-mdc($candy-app-theme);