Changes configuration to merge default, system and user config instea…

…d of replacing it
openpreserve · Sep 23, 2014 · 625146a · 625146a
1 parent 5109073
commit 625146a
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/planning-core/src/main/resources/config/configurationBuilder.xml b/planning-core/src/main/resources/config/configurationBuilder.xml
@@ -1,6 +1,6 @@
 <?xml version="1.1" encoding="UTF-8" ?>
 <configuration>
-    <override>
+    <additional>
         <xml fileName="configurationLocation.xml" config-name="configuration.location" />
 
         <properties
@@ -11,5 +11,5 @@
             config-optional="true" config-name="configuration.system" />
         <properties fileName="configuration.properties"
             config-name="configuration.default" />
-    </override>
+    </additional>
 </configuration>