Try to fix merge conflicts...?

assemblymade · Apr 14, 2015 · c801006 · c801006
1 parent 8c9d34b
commit c801006
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
@@ -24,8 +24,4 @@
 @import "components/*";
 @import "app/slop";
 
-@import "libs/owl.carousel";
-@import "libs/owl.transitions";
-@import "libs/owl.theme";
-
 @import "c3/c3";