resolve conflicts on app/assets/stylesheets/framework.scss

70808fcb · Mario de la Ossa · fbc87366 · 70808fcb
Commit 70808fcb authored Feb 05, 2018 by Mario de la Ossa
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/assets/stylesheets/framework.scss app/assets/stylesheets/framework.scss +0 -3

No files found.
--- a/app/assets/stylesheets/framework.scss
+++ b/app/assets/stylesheets/framework.scss
@@ -59,8 +59,5 @@
 @import "framework/memory_graph";
 @import "framework/responsive_tables";
 @import "framework/stacked-progress-bar";
-<<<<<<< HEAD
 @import "framework/sortable";
-=======
->>>>>>> upstream/master
 @import "framework/ci_variable_list";