Resolve conflict in doc/user/admin_area/custom_project_templates.md

Reslove conflicts for https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/8664

doc/user/admin_area/custom_project_templates.md

-<<<<<<< HEAD
-# Custom project templates **[PREMIUM ONLY]**
-
-> **Notes:**
-> [Introduced](https://gitlab.com/gitlab-org/gitlab-ee/issues/6860) in [GitLab Premium](https://about.gitlab.com/pricing) 11.2
-=======
 # Custom instance-level project templates **[PREMIUM ONLY]**
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab-ee/issues/6860) in [GitLab Premium](https://about.gitlab.com/pricing) 11.2.
->>>>>>> upstream/master
 
 When you create a new project, creating it based on custom project templates is
 a convenient option to bootstrap from an existing project boilerplate.
@@ -16,11 +9,7 @@ source can be found under **Admin > Settings > Custom project templates**.
 
 Within this section, you can configure the group where all the custom project
 templates are sourced. Every project directly under the group namespace will be
-<<<<<<< HEAD
-available to the user if they have access to them. For example: Every public
-=======
 available to the user if they have access to them. For example, every public
->>>>>>> upstream/master
 project in the group will be available to every logged user. However,
 private projects will be available only if the user has view [permissions](../permissions.md)
 in the project:
@@ -31,10 +20,6 @@ in the project:
 Projects below subgroups of the template group are **not** supported.
 
 Repository and database information that are copied over to each new project are
-<<<<<<< HEAD
- identical to the data exported with [GitLab's Project Import/Export](../project/settings/import_export.md).
-=======
 identical to the data exported with [GitLab's Project Import/Export](../project/settings/import_export.md).
 
 If you would like to set project templates at a group level, please see [Custom group-level project templates](../group/custom_project_templates.md).
->>>>>>> upstream/master