Resolve lib/gitlab/shell.rb

7f0bd503 · Lin Jen-Shin · 1f8c11a4 · 7f0bd503
Commit 7f0bd503 authored Dec 16, 2017 by Lin Jen-Shin
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

lib/gitlab/shell.rb lib/gitlab/shell.rb +0 -3

No files found.
--- a/lib/gitlab/shell.rb
+++ b/lib/gitlab/shell.rb
@@ -385,11 +385,8 @@ module Gitlab
      success
    end

-<<<<<<< HEAD
-=======
    # Delete branch from remote repository
    #
->>>>>>> upstream/master
    # storage - project's storage path
    # project_name - project's disk path
    # remote_name - remote name