Commit 2f88e971 authored by Misagh Moayyed's avatar Misagh Moayyed

fixed merged conflicts

parent e2c3b103
......@@ -77,7 +77,7 @@
</dependencies>
<properties>
<cas.version>5.2.0-RC4</cas.version>
<cas.version>5.2.0-SNAPSHOT</cas.version>
<springboot.version>1.5.7.RELEASE</springboot.version>
<!-- app.server could be -jetty, -undertow, -tomcat, or blank if you plan to provide appserver -->
<app.server>-tomcat</app.server>
......
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