Resolve slash_commands commands conflict after merge from CE

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

app/models/merge_request.rb

@@ -105,11 +105,8 @@ class MergeRequest < ActiveRecord::Base
   validates :merge_user, presence: true, if: :merge_when_pipeline_succeeds?, unless: :importing?
   validate :validate_branches, unless: [:allow_broken, :importing?, :closed_without_fork?]
   validate :validate_fork, unless: :closed_without_fork?
-<<<<<<< HEAD
   validate :validate_approvals_before_merge
-=======
   validate :validate_target_project, on: :create
->>>>>>> ce-com/master
 
   scope :by_source_or_target_branch, ->(branch_name) do
     where("source_branch = :branch OR target_branch = :branch", branch: branch_name)

app/services/slash_commands/interpret_service.rb

@@ -330,7 +330,6 @@ module SlashCommands
       @updates[:target_branch] = branch_name if project.repository.branch_names.include?(branch_name)
     end
 
-<<<<<<< HEAD
     desc 'Set weight'
     params Issue::WEIGHT_RANGE.to_s.squeeze('.').tr('.', '-')
     condition do
@@ -352,7 +351,8 @@ module SlashCommands
     end
     command :clear_weight do
       @updates[:weight] = nil
-=======
+    end
+
     desc 'Move issue from one column of the board to another'
     params '~"Target column"'
     condition do
@@ -373,7 +373,6 @@ module SlashCommands
           issuable.labels.on_project_boards(issuable.project_id).where.not(id: label_id).pluck(:id)
         @updates[:add_label_ids] = [label_id]
       end
->>>>>>> ce-com/master
     end
 
     def find_label_ids(labels_param)

doc/user/project/slash_commands.md

@@ -36,9 +36,6 @@ do.
 | `/remove_time_spent`       | Remove time spent |
 | `/target_branch <Branch Name>` | Set target branch for current merge request |
 | `/award :emoji:`  | Toggle award for :emoji: |
-<<<<<<< HEAD
 | `/weight <1-9>` | Set the weight of the issue |
 | `/clear_weight` | Clears the issue weight |
-=======
 | `/board_move ~column`      | Move issue to column on the board |
->>>>>>> ce-com/master