diff options
| author | Marcel Amirault <ravlen@gmail.com> | 2018-09-19 16:03:00 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axil@gitlab.com> | 2018-09-21 16:29:14 +0200 |
| commit | 109cfd951d0763d72cf0f9b72f45a4a58af76ad1 (patch) | |
| tree | 98e374609326f00fd8e37c20652ab3d334226d28 /doc/development/automatic_ce_ee_merge.md | |
| parent | a4a7c5316ca9700ec88c24da6b737f47b5cfc61e (diff) | |
| download | gitlab-ce-109cfd951d0763d72cf0f9b72f45a4a58af76ad1.tar.gz | |
Correct grammar (setup to set-up) in Docs
Diffstat (limited to 'doc/development/automatic_ce_ee_merge.md')
| -rw-r--r-- | doc/development/automatic_ce_ee_merge.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/development/automatic_ce_ee_merge.md b/doc/development/automatic_ce_ee_merge.md index f6509b5c1dd..9dd78806a12 100644 --- a/doc/development/automatic_ce_ee_merge.md +++ b/doc/development/automatic_ce_ee_merge.md @@ -63,7 +63,7 @@ EE version of your CE merge request. For each commit (except on `master`), the `ee_compat_check` CI job tries to detect if the current branch's changes will conflict during the CE->EE merge. -The job reports what files are conflicting and how to setup a merge request +The job reports what files are conflicting and how to set up a merge request against EE. #### How the job works |