Commit f5736fac authored by Stan Hu's avatar Stan Hu

Resolve conflict in app/controllers/projects/milestones_controller.rb

parent d26074e0
......@@ -43,14 +43,12 @@ class Projects::MilestonesController < Projects::ApplicationController
def show
@project_namespace = @project.namespace.becomes(Namespace)
<<<<<<< HEAD
if @project.feature_available?(:burndown_charts, current_user) &&
@project.feature_available?(:issue_weights, current_user)
@burndown = Burndown.new(@milestone)
=======
respond_to do |format|
format.html
>>>>>>> upstream/master
end
end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment