# HG changeset patch
# User Chris Cannam <chris.cannam@soundsoftware.ac.uk>
# Date 1389792852 0
# Node ID c8d3ad483bea4a0115c49ca4112fbf1fbe19c22e
# Parent  51364c0cd58fdf3818a26c9233001d1eafaabd0f
Fix stray merge markers

diff -r 51364c0cd58f -r c8d3ad483bea app/helpers/activities_helper.rb
--- 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
diff -r 51364c0cd58f -r c8d3ad483bea app/helpers/my_helper.rb
--- 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