Merge branch 'docs/rs-version-conflicts' into 'master'

Add a merge strategy for `VERSION` to automatically use EE version See merge request gitlab-org/gitlab-ee!4934

Merge branch 'docs/rs-version-conflicts' into 'master'
Add a merge strategy for `VERSION` to automatically use EE version See merge request gitlab-org/gitlab-ee!4934
c310ce70 · Rémy Coutable · 56bc401e · 26e5c136 · c310ce70
Commit c310ce70 authored Mar 28, 2018 by Rémy Coutable
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

.gitattributes .gitattributes +1 -0

No files found.
--- a/.gitattributes
+++ b/.gitattributes
+VERSION merge=ours