Commit 7ca36dd9 authored by Clement Ho's avatar Clement Ho

Fix indention and bad conflict merge

parent 6e4c4b0d
...@@ -12,7 +12,6 @@ import notificationsDropdown from './notifications_dropdown'; ...@@ -12,7 +12,6 @@ import notificationsDropdown from './notifications_dropdown';
import groupAvatar from './group_avatar'; import groupAvatar from './group_avatar';
import GroupLabelSubscription from './group_label_subscription'; import GroupLabelSubscription from './group_label_subscription';
import LineHighlighter from './line_highlighter'; import LineHighlighter from './line_highlighter';
import CILintEditor from './ci_lint_editor';
import groupsSelect from './groups_select'; import groupsSelect from './groups_select';
import Search from './search'; import Search from './search';
import initAdmin from './admin'; import initAdmin from './admin';
......
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