Preserve changes to methods after merge

app/models/lettings_log.rb

@@ -709,15 +709,15 @@ class LettingsLog < Log
   def scheme_has_multiple_locations?
     return false unless scheme
 
-    @scheme_locations_count ||= scheme.locations.active_in_2_weeks.size
+    scheme_locations_count ||= scheme.locations.active_in_2_weeks.size
-    @scheme_locations_count > 1
+    scheme_locations_count > 1
   end
 
   def scheme_has_large_number_of_locations?
     return false unless scheme
 
-    @scheme_locations_count ||= scheme.locations.active_in_2_weeks.size
+    scheme_locations_count ||= scheme.locations.active_in_2_weeks.size
-    @scheme_locations_count > 19
+    scheme_locations_count > 19
   end
 
 private