Fixed conflicts in legacy_api_update_service.rb

ebdafe97 · Yorick Peterse · 6a1a6d2d · ebdafe97
Commit ebdafe97 authored Aug 20, 2018 by Yorick Peterse
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 8 deletions

app/services/protected_branches/legacy_api_update_service.rb app/services/protected_branches/legacy_api_update_service.rb +0 -8

No files found.
--- a/app/services/protected_branches/legacy_api_update_service.rb
+++ b/app/services/protected_branches/legacy_api_update_service.rb
@@ -38,7 +38,6 @@ module ProtectedBranches

    def delete_redundant_access_levels
      unless @developers_can_merge.nil?
-<<<<<<< HEAD
        @protected_branch.merge_access_levels.destroy_all # rubocop: disable DestroyAll # rubocop: disable DestroyAll
      end

@@ -65,13 +64,6 @@ module ProtectedBranches
      when false
        @protected_branch.push_access_levels.developer.destroy_all # rubocop: disable DestroyAll
        @protected_branch.push_access_levels.maintainer.destroy_all # rubocop: disable DestroyAll
-=======
-        @protected_branch.merge_access_levels.destroy_all # rubocop: disable DestroyAll
-      end
-
-      unless @developers_can_push.nil?
-        @protected_branch.push_access_levels.destroy_all # rubocop: disable DestroyAll
->>>>>>> upstream/master
      end
    end
  end