Resolve lib/gitlab/slash_commands/presenters/issue_base.rb

f11fa3ca · Lin Jen-Shin · 8ee76793 · f11fa3ca
Commit f11fa3ca authored Dec 16, 2017 by Lin Jen-Shin
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

lib/gitlab/slash_commands/presenters/issue_base.rb lib/gitlab/slash_commands/presenters/issue_base.rb +0 -3

No files found.
--- a/lib/gitlab/slash_commands/presenters/issue_base.rb
+++ b/lib/gitlab/slash_commands/presenters/issue_base.rb
@@ -33,14 +33,11 @@ module Gitlab
            {
              title: "Labels",
              value: resource.labels.any? ? resource.label_names.join(', ') : "_None_",
-<<<<<<< HEAD
              short: true
            },
            {
              title: "Weight",
              value: resource.weight? ? resource.weight : "_None_",
-=======
->>>>>>> upstream/master
              short: true
            }
          ]