WEB-INF/web.xml WEB-INF/tomcat-web.xml ${catalina.base}/conf/web.xml <<<<<<< HEAD ======= >>>>>>> branch 'master' of http://112.172.147.34:4936/style24/Servers.git <<<<<<< HEAD ======= >>>>>>> branch 'master' of http://112.172.147.34:4936/style24/Servers.git