Commit e6fcd6d5 authored by James Lopez's avatar James Lopez

fixed more import merging issues

parent 5b51d13c
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
"path": "gitlabhq", "path": "gitlabhq",
"description": null, "description": null,
"issues_enabled": true, "issues_enabled": true,
"wall_enabled": false,
"merge_requests_enabled": true, "merge_requests_enabled": true,
"wiki_enabled": true, "wiki_enabled": true,
"snippets_enabled": true, "snippets_enabled": true,
......
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