Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/Evolveum/midpoint
Browse files Browse the repository at this point in the history
  • Loading branch information
KaterynaHonchar committed Mar 15, 2016
2 parents df11ac1 + 3b6282d commit 882dac7
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions gui/admin-gui/src/test/resources/ctx-admin-gui-test-main.xml
Expand Up @@ -39,7 +39,7 @@
<import resource="classpath*:ctx-workflow.xml" />
<import resource="classpath*:ctx-notifications.xml" />
<import resource="classpath:ctx-certification.xml" />
<import resource="file:gui/admin-gui/src/main/webapp/WEB-INF/ctx-init.xml" />
<import resource="file:gui/admin-gui/src/main/webapp/WEB-INF/ctx-web-security.xml" />
<import resource="file:gui/admin-gui/src/main/webapp/WEB-INF/ctx-webapp.xml" />
<import resource="file:src/main/webapp/WEB-INF/ctx-init.xml" />
<import resource="file:src/main/webapp/WEB-INF/ctx-web-security.xml" />
<import resource="file:src/main/webapp/WEB-INF/ctx-webapp.xml" />
</beans>

0 comments on commit 882dac7

Please sign in to comment.