Skip to content

G
gitlab-ce
Commit 40678da6 authored by Rémy Coutable's avatar Rémy Coutable
Browse files
Options

Resolve conflict in app/assets/stylesheets/framework.scss 

Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
parent b76ac3ab
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
app/assets/stylesheets/framework.scss
View file @ 40678da6
......@@ -59,7 +59,4 @@
@import "framework/memory_graph";
@import "framework/responsive_tables";
@import "framework/stacked-progress-bar";
<<<<<<< HEAD
@import "framework/sortable";
=======
>>>>>>> upstream/master
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7