This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new 7956621 [OPENMEETINGS-2151] wicket-bootstrap has been released
7956621 is described below
commit 795662185a280ad967eb6343fa82c8659c9ca3bb
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Fri Feb 28 09:13:42 2020 +0700
[OPENMEETINGS-2151] wicket-bootstrap has been released
---
pom.xml | 4 ----
1 file changed, 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index bcdb5ae..3a9f40d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -75,11 +75,7 @@
<forbiddenapis.version>2.7</forbiddenapis.version>
<!-- dependency versions -->
<junit.version>5.6.0</junit.version>
-<<<<<<< HEAD
- <wicket.version>9.0.0-M4</wicket.version>
-=======
<wicket.version>9.0.0-M5-SNAPSHOT</wicket.version>
->>>>>>> csp
<wicketju.version>9.0.0-M4</wicketju.version>
<wickets.version>9.0.0-M5-SNAPSHOT</wickets.version>
<wicket-bootstrap.version>5.0.0-M1</wicket-bootstrap.version>
