Commit 70808fcb authored by Mario de la Ossa's avatar Mario de la Ossa

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

parent fbc87366
......@@ -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";
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment