fixed merge conflict

diff --git a/mig-xml/evergreen_staged_report.xml b/mig-xml/evergreen_staged_report.xml
index b89183b..81f3cc1 100644 (file)
--- a/mig-xml/evergreen_staged_report.xml
+++ b/mig-xml/evergreen_staged_report.xml
@@ -1134,7 +1134,9 @@ id = ac_sc.owner GROUP BY 2,3 ORDER BY 2,3</query>
         <report_title>Action Triggers Setup for Notices</report_title>
         <heading>ID.Active.Owner.Name</heading>
         <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));
@@ -1148,9 +1150,9 @@ id = ac_sc.owner GROUP BY 2,3 ORDER BY 2,3</query>
         <report_title>Count of Notices Run with State</report_title>
         <heading>Count of Notices.State.ID.Owner.Name</heading>
         <query>SELECT COUNT(ate.id), ate.state, ed.id, aou.shortname, ed.name 
-            FROM m_action_trigger.event_definition ed 
+            FROM action_trigger.event_definition ed 
             JOIN actor.org_unit aou ON aou.id = ed.owner 
-            JOIN m_action_trigger.event ate ON ate.event_def = ed.id 
+            JOIN action_trigger.event ate ON ate.event_def = ed.id 
             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))
             GROUP BY 2,3,4;