diff options
| author | Greg Wilkins | 2015-02-19 03:07:42 +0000 |
|---|---|---|
| committer | Greg Wilkins | 2015-02-19 03:07:42 +0000 |
| commit | e83549f4b4ba0bb4695cd92bb6b3dbcbbe34ce07 (patch) | |
| tree | 2d73ef1e614b63c5826492d8643edca5f76fd405 /jetty-fcgi | |
| parent | c22d79f673d9c7c04a10965111d603b1ee0522c0 (diff) | |
| download | org.eclipse.jetty.project-e83549f4b4ba0bb4695cd92bb6b3dbcbbe34ce07.tar.gz org.eclipse.jetty.project-e83549f4b4ba0bb4695cd92bb6b3dbcbbe34ce07.tar.xz org.eclipse.jetty.project-e83549f4b4ba0bb4695cd92bb6b3dbcbbe34ce07.zip | |
fixed bad merge
Diffstat (limited to 'jetty-fcgi')
| -rw-r--r-- | jetty-fcgi/fcgi-server/pom.xml | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/jetty-fcgi/fcgi-server/pom.xml b/jetty-fcgi/fcgi-server/pom.xml index eeb16493bc..478e9846f8 100644 --- a/jetty-fcgi/fcgi-server/pom.xml +++ b/jetty-fcgi/fcgi-server/pom.xml @@ -1,21 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <parent> + <groupId>org.eclipse.jetty.fcgi</groupId> + <artifactId>fcgi-parent</artifactId> + <version>9.3.0-SNAPSHOT</version> </parent> -||||||| merged common ancestors -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <parent> - <groupId>org.eclipse.jetty.fcgi</groupId> - <artifactId>fcgi-parent</artifactId> - <version>9.2.8-SNAPSHOT</version> - </parent> -======= -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <parent> - <groupId>org.eclipse.jetty.fcgi</groupId> - <artifactId>fcgi-parent</artifactId> - <version>9.2.9-SNAPSHOT</version> - </parent> ->>>>>>> origin/jetty-9.2.x <modelVersion>4.0.0</modelVersion> <artifactId>fcgi-server</artifactId> |