From c8010068277e425f9d7529e434bcf3fd0ccab79b Mon Sep 17 00:00:00 2001 From: lachlanjc Date: Mon, 13 Apr 2015 23:35:45 -0400 Subject: [PATCH] Try to fix merge conflicts...? --- app/assets/stylesheets/application.scss | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 5f484cc53..c18fa9935 100644 --- 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";