fixed merge

This commit is contained in:
Greg Wilkins 2014-08-29 17:54:28 +10:00
parent dacc796831
commit 277ca5c065
2 changed files with 28 additions and 28 deletions

View File

@ -12,7 +12,7 @@
<description>Jetty Quick Start Test</description> <description>Jetty Quick Start Test</description>
<url>http://www.eclipse.org/jetty</url> <url>http://www.eclipse.org/jetty</url>
<properties> <properties>
<bundle-symbolic-name>${project.groupId}.examples.quickstart</bundle-symbolic-name> <bundle-symbolic-name>${project.groupId}.tests.quickstart</bundle-symbolic-name>
</properties> </properties>
<dependencies> <dependencies>
<dependency> <dependency>