Commit b9972736 authored by Mike Greiling's avatar Mike Greiling

fix duplicate keys due to bad conflict resolution

parent 1c55ff4c
...@@ -150,9 +150,6 @@ var config = { ...@@ -150,9 +150,6 @@ var config = {
'notebook_viewer', 'notebook_viewer',
'pdf_viewer', 'pdf_viewer',
'pipelines', 'pipelines',
'mr_widget_ee',
'issue_show',
'balsamiq_viewer',
'pipelines_graph', 'pipelines_graph',
'schedule_form', 'schedule_form',
'schedules_index', 'schedules_index',
......
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