Commit 6f01fcee authored by Matija Obreza's avatar Matija Obreza

Conflict in servlet.xml naming (don't use spring-*)

parent 50c60917
......@@ -404,7 +404,7 @@
</profile>
</profiles>
<version>9.0.1</version>
<version>0.9.0</version>
<url>http://genesys-pgr.org</url>
<description>Genesys 2 Server</description>
<organization>
......
......@@ -59,7 +59,7 @@
</servlet-class>
<init-param>
<param-name>contextConfigLocation</param-name>
<param-value>classpath:/spring/spring-servlet.xml</param-value>
<param-value>classpath:/spring/servlet.xml</param-value>
</init-param>
<load-on-startup>1</load-on-startup>
</servlet>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment