fa7ec23c by Ean Schuessler

Merge branch 'BF-7250' of /home/git/repositories/brainfood/ofbiz-directcontrolservlet

2 parents 93372177 e0d940cd
...@@ -23,6 +23,7 @@ under the License. ...@@ -23,6 +23,7 @@ under the License.
23 <resources> 23 <resources>
24 <fileset dir=".."> 24 <fileset dir="..">
25 <include name="apache-ofbiz/common.xml"/> 25 <include name="apache-ofbiz/common.xml"/>
26 <include name="ofbiz-upstream/common.xml"/>
26 <include name="ofbiz/common.xml"/> 27 <include name="ofbiz/common.xml"/>
27 </fileset> 28 </fileset>
28 <fileset dir="/"> 29 <fileset dir="/">
......