diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-12-05 19:49:49 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-12-05 19:49:49 +0300 |
| commit | aaf16997303a470809c8be442a537983b49f0f7d (patch) | |
| tree | 388cdebfa8d95f19f86dc23754121a9bbe76e301 /doc/development/README.md | |
| parent | 003a816afa885d56aa1eb4aadbad2b13b1baa25b (diff) | |
Move the "Limit conflicts with EE" doc to "Automatic CE-> EE merge"
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'doc/development/README.md')
| -rw-r--r-- | doc/development/README.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/development/README.md b/doc/development/README.md index 6892838be7f..944880d8ac7 100644 --- a/doc/development/README.md +++ b/doc/development/README.md @@ -16,7 +16,7 @@ comments: false - [GitLab core team & GitLab Inc. contribution process](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/PROCESS.md) - [Generate a changelog entry with `bin/changelog`](changelog.md) - [Code review guidelines](code_review.md) for reviewing code and having code reviewed. -- [Limit conflicts with EE when developing on CE](limit_ee_conflicts.md) +- [Automatic CE->EE merge](automatic_ce_ee_merge.md) ## UX and frontend guides |