CE->EE: Fix conflicts relating to project snapshots

doc/api/projects.md

@@ -1545,7 +1545,3 @@ GET /projects/:id/snapshot
 | --------- | ---- | -------- | ----------- |
 | `id`      | integer/string | yes | The ID or [URL-encoded path of the project](README.md#namespaced-path-encoding) |
 | `wiki`    | boolean | no | Whether to download the wiki, rather than project, repository |
-<<<<<<< HEAD
-=======
-
->>>>>>> upstream/master

lib/api/helpers/project_snapshots_helpers.rb

 module API
   module Helpers
     module ProjectSnapshotsHelpers
-<<<<<<< HEAD
       prepend ::EE::API::Helpers::ProjectSnapshotsHelpers
 
-=======
->>>>>>> upstream/master
       def authorize_read_git_snapshot!
         authenticated_with_full_private_access!
       end