Resolve conflict in LICENSE

Based on gitlab-org/gitlab-ce!14374 and gitlab-org/gitlab-ee!2935.
Signed-off-by: Rémy Coutable <remy@rymai.me>

LICENSE

 The GitLab Enterprise Edition (EE) license (the “EE License”)
 Copyright (c) 2011-2017 GitLab B.V.
 
-<<<<<<< HEAD
+With regard to the GitLab Software:
+
 This software and associated documentation files (the "Software") may only be
 used in production, if you (and any entity that you represent) have agreed to,
 and are in compliance with, the GitLab Subscription Terms of Service, available
@@ -21,16 +22,6 @@ all right, title and interest in and to all such modifications.  You are not
 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.
-=======
-With regard to the GitLab Software:
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
->>>>>>> upstream/master
 
 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
@@ -41,13 +32,6 @@ license. The full text of this EE License shall be included in all copies or
 substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-<<<<<<< HEAD
-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.
-=======
 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
@@ -58,4 +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.
->>>>>>> upstream/master