Resolved conflict in dashboard_controller

b7e3f3c3 · Jan Provaznik · aada95e0 · b7e3f3c3
Commit b7e3f3c3 authored Apr 06, 2018 by Jan Provaznik
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/controllers/dashboard_controller.rb app/controllers/dashboard_controller.rb +0 -3

No files found.
--- a/app/controllers/dashboard_controller.rb
+++ b/app/controllers/dashboard_controller.rb
@@ -6,10 +6,7 @@ class DashboardController < Dashboard::ApplicationController
    :author_id,
    :assignee_id,
    :milestone_title,
-<<<<<<< HEAD
    :weight,
-=======
->>>>>>> upstream/master
    :label_name
  ].freeze