Resolve conflict in app/models/repository.rb

Signed-off-by: Rémy Coutable <remy@rymai.me>

app/models/repository.rb

@@ -777,7 +777,6 @@ class Repository
 
   def with_cache_hooks
     result = yield
-<<<<<<< HEAD
 
     return unless result
 
@@ -787,17 +786,6 @@ class Repository
     result.newrev
   end
 
-=======
-
-    return unless result
-
-    after_create if result.repo_created?
-    after_create_branch if result.branch_created?
-
-    result.newrev
-  end
-
->>>>>>> ce-com/master
   def with_branch(user, *args)
     with_cache_hooks do
       Gitlab::Git::OperationService.new(user, raw_repository).with_branch(*args) do |start_commit|
@@ -868,7 +856,6 @@ class Repository
     end
   end
 
-<<<<<<< HEAD
   def ff_merge(user, source, target_branch, merge_request: nil)
     our_commit = rugged.branches[target_branch].target
     their_commit =
@@ -888,8 +875,6 @@ class Repository
     end
   end
 
-=======
->>>>>>> ce-com/master
   def merge(user, source_sha, merge_request, message)
     with_cache_hooks do
       raw_repository.merge(user, source_sha, merge_request.target_branch, message) do |commit_id|