From 9bdfddc1d3d4f804cf497a4951c75f132e33ad5f Mon Sep 17 00:00:00 2001
From: Brett Porter <brett@apache.org>
Date: Thu, 20 Jan 2011 04:37:59 +0000
Subject: update the version so there's no conflict

git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/MRM-1327-jcr-backend-default@1061121 13f79535-47bb-0310-9956-ffa450edef68
---
 archiva-jetty/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'archiva-jetty')

diff --git a/archiva-jetty/pom.xml b/archiva-jetty/pom.xml
index 31d4475d7..dd88b0c2f 100644
--- a/archiva-jetty/pom.xml
+++ b/archiva-jetty/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva</artifactId>
-    <version>1.4-SNAPSHOT</version>
+    <version>1.4-MRM-1327-SNAPSHOT</version>
   </parent>
   <artifactId>archiva-jetty</artifactId>
   <packaging>pom</packaging>
-- 
cgit v1.2.3