Resolve conflicts with ee/changelogs/unreleased files

Signed-off-by: Rémy Coutable <remy@rymai.me>

Resolve conflicts with ee/changelogs/unreleased files
Signed-off-by: Rémy Coutable <remy@rymai.me>
d3bb4f5a · Rémy Coutable · 1a93fbe6 · d3bb4f5a · d3bb4f5a · d3bb4f5a
Commit d3bb4f5a authored Feb 22, 2018 by Rémy Coutable
7 changed files
--- a/changelogs/unreleased-ee/3776-ci-view-for-sast.yml
+++ b/changelogs/unreleased-ee/3776-ci-view-for-sast.yml
--- a/changelogs/unreleased-ee/4546-add-admin-note-to-user-show-page.yml
+++ b/changelogs/unreleased-ee/4546-add-admin-note-to-user-show-page.yml
--- a/changelogs/unreleased-ee/4887-geo-improve-formatting-of-can-t-push-to-secondary-warning-message.yml
+++ b/changelogs/unreleased-ee/4887-geo-improve-formatting-of-can-t-push-to-secondary-warning-message.yml
--- a/changelogs/unreleased-ee/4929-internationalize-lock-files.yml
+++ b/changelogs/unreleased-ee/4929-internationalize-lock-files.yml
--- a/ee/changelogs/unreleased/fix-show-sidebar-sub-level-items-for-billing.yml
+++ b/ee/changelogs/unreleased/fix-show-sidebar-sub-level-items-for-billing.yml
---
-title: Override group sidebar links
-merge_request: 4234
-author: George Tsiolis
-type: fixed
--- a/ee/changelogs/unreleased/fix-validation-of-environment-scope-for-variables.yml
+++ b/ee/changelogs/unreleased/fix-validation-of-environment-scope-for-variables.yml
---
-title: Fix validation of environment scope of variables
-merge_request:
-author:
-type: fixed
--- a/changelogs/unreleased-ee/ide-command-palette-fix.yml
+++ b/changelogs/unreleased-ee/ide-command-palette-fix.yml