Mercurial > hg > soundsoftware-site
changeset 1485:c8d3ad483bea redmine-2.4-integration
Fix stray merge markers
| author | Chris Cannam <chris.cannam@soundsoftware.ac.uk> |
|---|---|
| date | Wed, 15 Jan 2014 13:34:12 +0000 |
| parents | 51364c0cd58f |
| children | 234d18ea18e9 |
| files | app/helpers/activities_helper.rb app/helpers/my_helper.rb |
| diffstat | 2 files changed, 0 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/app/helpers/activities_helper.rb Wed Jan 15 09:59:14 2014 +0000 +++ b/app/helpers/activities_helper.rb Wed Jan 15 13:34:12 2014 +0000 @@ -178,5 +178,4 @@ insthash.keys.select { |k| insthash[k] >= threshold }.sample(count) end ->>>>>>> other end
--- a/app/helpers/my_helper.rb Wed Jan 15 09:59:14 2014 +0000 +++ b/app/helpers/my_helper.rb Wed Jan 15 13:34:12 2014 +0000 @@ -75,6 +75,4 @@ order("#{TimeEntry.table_name}.spent_on DESC, #{Project.table_name}.name ASC, #{Tracker.table_name}.position ASC, #{Issue.table_name}.id ASC"). all end -======= ->>>>>>> other end