From: Rogan Hamby <rhamby@esilibrary.com>
Date: Thu, 23 Jan 2020 14:23:14 +0000 (-0500)
Subject: fixed merge conflict
X-Git-Url: http://git.equinoxoli.org/?p=migration-tools.git;a=commitdiff_plain;h=01a59bd308f78acbe974fafe3030148d2f5c95fb

fixed merge conflict
---

01a59bd308f78acbe974fafe3030148d2f5c95fb
diff --cc mig-xml/evergreen_staged_report.xml
index 8978099,b89183b..81f3cc1
--- a/mig-xml/evergreen_staged_report.xml
+++ b/mig-xml/evergreen_staged_report.xml
@@@ -1133,8 -1133,8 +1133,10 @@@ id = ac_sc.owner GROUP BY 2,3 ORDER BY 
          <iteration>0</iteration>
          <report_title>Action Triggers Setup for Notices</report_title>
          <heading>ID.Active.Owner.Name</heading>
-         <query>SELECT ed.id, ed.active, aou.shortname, ed.name
+         <query>SELECT ed.id, ed.active::TEXT, aou.shortname, ed.name
 -            FROM m_action_trigger.event_definition ed 
++            FROM action_trigger.event_definition ed 
++        <query>SELECT ed.id, ed.active::TEXT, aou.shortname, ed.name
 +            FROM action_trigger.event_definition ed 
              JOIN actor.org_unit aou ON aou.id = ed.owner 
              WHERE ed.owner IN (SELECT DISTINCT home_ou FROM m_actor_usr)
              OR ed.owner IN (SELECT DISTINCT parent_ou FROM actor.org_unit WHERE id in (SELECT DISTINCT home_ou FROM m_actor_usr));