Resolve conflict in PHILOSOPHY.md

Resolve conflicts for https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/8551

Resolve conflict in PHILOSOPHY.md
Resolve conflicts for https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/8551
137be19e · Steve Azzopardi · d915aa64 · 137be19e
Commit 137be19e authored Nov 22, 2018 by Steve Azzopardi
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

PHILOSOPHY.md PHILOSOPHY.md +0 -4

No files found.
--- a/PHILOSOPHY.md
+++ b/PHILOSOPHY.md
-<<<<<<< HEAD
 This document is intended to communicate the product philosophy GitLab uses in creating GitLab Enterprise Edition. The principles can be found in the [Product Section of the GitLab Handbook](https://about.gitlab.com/handbook/product/#product-at-gitlab).
-=======
-This document is intended to communicate the product philosophy GitLab uses in creating GitLab Community Edition. The principles can be found in the [Product Section of the GitLab Handbook](https://about.gitlab.com/handbook/product/#product-at-gitlab).
->>>>>>> upstream/master