From 17038057a9e4ea5168c76d2c93375f1054394317 Mon Sep 17 00:00:00 2001
From: Paul Cantrell <cantrell@pobox.com>
Date: Mon, 20 Mar 2017 23:01:39 -0500
Subject: [PATCH] Wording tweak in analysis

---
 src/lib/tasks/app.rake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lib/tasks/app.rake b/src/lib/tasks/app.rake
index 95d17560..c0c691e8 100644
--- a/src/lib/tasks/app.rake
+++ b/src/lib/tasks/app.rake
@@ -384,7 +384,7 @@ namespace :app do
       end
     puts
 
-    puts "Scheduling overlaps that will upset the most people"
+    puts "Scheduling conflicts that would upset the most people"
     puts
     pairs = Attendance.connection.select_rows("
         select a1.session_id s1,
@@ -408,7 +408,7 @@ namespace :app do
       status = if !s1.timeslot_id || !s2.timeslot_id
         '(unscheduled)'
       elsif s1.timeslot_id == s2.timeslot_id
-        'CONFLICT'
+        'CONFLICT AS SCHEDULED'
       else
         ''
       end