Changeset 24398 in main

Timestamp:

12/31/21 13:40:06 (11 months ago)

Author:

LoisHaggard_STG

Message:

NM mmibis-content mort/MortCnty.xml demonstration of SVN conflict

File:

• adopters/nm/trunk/src/main/webapps/nmibis-content/xml/query/module/mort/MortCnty.xml (modified) (2 diffs)

adopters/nm/trunk/src/main/webapps/nmibis-content/xml/query/module/mort/MortCnty.xml

@@ -2 +2 @@
 
 <QUERY_MODULE xmlns:ibis="http://www.ibisph.org">
-        <!-- LOIS - COMMENT THIS OUT FOR PRODUCTION VERSION -->
+        <QUERY_APPLICATION_REQUEST_ADD_NON_FILTERED_GROUP_BY_DIMENSION_VALUES_FLAG/>
         <DEVELOPMENT_FLAG/><!--  -->
 
@@ -40 +40 @@
         </QUERY_CONFIGURATION_SELECTION>
 
-        <QUERY_APPLICATION_REQUEST_ADD_NON_FILTERED_GROUP_BY_DIMENSION_VALUES_FLAG/>
         <QUERY_APPLICATION_HTTP_REQUEST_TYPE>post</QUERY_APPLICATION_HTTP_REQUEST_TYPE>