Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2026-01-07 01:38:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix incomplete merge in 899df1e

Browse source
This commit is contained in:
Dan Rice 2014-03-27 21:40:59 -04:00
parent 185e967a58
commit 655d59c1ee
1 changed files with 0 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/todos_controller.rb
View file

@ -769,11 +769,7 @@ class TodosController < ApplicationController
@items = get_not_completed_for_predecessor(current_user, @todo.id) unless !@items.empty?
else
# New todo - TODO: Filter on current project in project view
<<<<<<< HEAD
@items = get_not_complete_for_predecessor(current_user)
=======
@items = get_not_completed_for_predecessor(current_user)
>>>>>>> master
end
render :inline => format_dependencies_as_json_for_auto_complete(@items)
end