From 9f3262ba648d28a7a3b9c8981b7864f087a8644c Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Wed, 16 May 2018 20:10:40 +0300
Subject: [PATCH] Resolve conflict in LICENSE

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 LICENSE | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/LICENSE b/LICENSE
index 9f708aae32305..4e91f509a060a 100644
--- a/LICENSE
+++ b/LICENSE
@@ -23,7 +23,6 @@ granted any other rights beyond what is expressly stated herein.  Subject to the
 foregoing, it is forbidden to copy, merge, publish, distribute, sublicense,
 and/or sell the Software.
 
-<<<<<<< HEAD
 This EE License applies only to the part of this Software that is not
 distributed as part of GitLab Community Edition (CE), and that is not a file
 that produces client-side JavaScript, in whole or in part. Any part of this
@@ -43,11 +42,3 @@ THE SOFTWARE.
 For all third party components incorporated into the GitLab Software, those
 components are licensed under the original license provided by the owner of the
 applicable component.
-
----
-
-All Documentation content that resides under the doc/ directory of this
-repository is licensed under Creative Commons: CC BY-SA 4.0.
-=======
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
->>>>>>> upstream/master
-- 
GitLab