summaryrefslogtreecommitdiff
path: root/BKUOnline
diff options
context:
space:
mode:
authorclemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>2008-09-12 14:20:43 +0000
committerclemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>2008-09-12 14:20:43 +0000
commit14a2bb1d4015aa2facc7faf59ad8ad7441a7119e (patch)
tree5ada9ce39b087d67e1cfc9137113480664baa379 /BKUOnline
parent9f441a0aaf0e55b50014e814410c61117f7330c4 (diff)
downloadmocca-14a2bb1d4015aa2facc7faf59ad8ad7441a7119e.tar.gz
mocca-14a2bb1d4015aa2facc7faf59ad8ad7441a7119e.tar.bz2
mocca-14a2bb1d4015aa2facc7faf59ad8ad7441a7119e.zip
conflict resolved
git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@36 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
Diffstat (limited to 'BKUOnline')
-rw-r--r--BKUOnline/pom.xml1
1 files changed, 0 insertions, 1 deletions
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>