fix lint

Author: andrewseguin

src/universal-app/theme.scss

@@ -1,8 +1,5 @@
 @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';