Merging Develop: Merge Conflict Solved

This commit is contained in:
Sanyam96
2017-10-11 17:43:05 +05:30
15 changed files with 583 additions and 160 deletions
@@ -32,7 +32,7 @@
<tx:annotation-driven />
<context:component-scan base-package="org.apache.fineract.spm"/>
<context:component-scan base-package="org.apache.fineract.spm.**"/>
<jpa:repositories base-package="org.apache.fineract.spm.repository"/>