From 14a2bb1d4015aa2facc7faf59ad8ad7441a7119e Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Fri, 12 Sep 2008 14:20:43 +0000
Subject: conflict resolved

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@36 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKUOnline/pom.xml | 1 -
 1 file changed, 1 deletion(-)

(limited to 'BKUOnline')

diff --git a/BKUOnline/pom.xml b/BKUOnline/pom.xml
index a50954cd..bcaf0a70 100644
--- a/BKUOnline/pom.xml
+++ b/BKUOnline/pom.xml
@@ -179,5 +179,4 @@
 			</plugin>
 		</plugins>
 	</build>
->>>>>>> .r33
 </project>
-- 
cgit v1.2.3