summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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>