Resolve conflicts

merge-requests/4/head
geethkokila 6 years ago
parent 0dea5cd0aa
commit 93af292037

@ -2195,11 +2195,7 @@
<!-- app management related versions -->
<googlecode.plist.version>1.8</googlecode.plist.version>
<net.dongliu.version>2.4.2</net.dongliu.version>
<<<<<<< HEAD
=======
>>>>>>> 625589decc78a4f3da8091a227c0fac6e2617c9e
<!--websocket related lib versions-->
<tomcat.websocket.version>7.0.85</tomcat.websocket.version>
<javax.websocket.version>1.0</javax.websocket.version>

Loading…
Cancel
Save