BAEL-305 - jetty version upgrade

2016-09-25 12:36:45 +02:00 · 2016-09-25 12:36:45 +02:00 · db3a847240
parent f24282cb27
commit db3a847240
1 changed files with 0 additions and 4 deletions
--- a/enterprise-patterns/front-controller-pattern/pom.xml
+++ b/enterprise-patterns/front-controller-pattern/pom.xml
@ -31,11 +31,7 @@
            <plugin>
                <groupId>org.eclipse.jetty</groupId>
                <artifactId>jetty-maven-plugin</artifactId>
-<<<<<<< HEAD
-                <version>9.3.11.v20160721</version>
-=======
                <version>9.4.0.M1</version>
->>>>>>> upstream/master
                <configuration>
                    <webApp>
                        <contextPath>/front-controller</contextPath>