Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/jetty-9.4.x'

This commit is contained in:
Greg Wilkins 2016-10-26 20:41:02 +11:00
parent ad7c3e0a7c 714d29db76
commit e6bca1f41a
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pom.xml
View File

@ -1436,7 +1436,6 @@
<alpn.version>8.1.9.v20160720</alpn.version> <alpn.version>8.1.9.v20160720</alpn.version>
</properties> </properties>
</profile> </profile>
<<<<<<< HEAD
<profile> <profile>
<id>8u111</id> <id>8u111</id>
<activation> <activation>