This is an automated email from the ASF dual-hosted git repository.
mgrigorov pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/wicket-site.git
The following commit(s) were added to refs/heads/asf-site by this push:
new 91091643 Resolve merge conflict in atom.xml
91091643 is described below
commit 9109164340aeaa426874462758d52a879114971f
Author: Martin Tzvetanov Grigorov <[email protected]>
AuthorDate: Mon Jul 14 18:09:22 2025 +0300
Resolve merge conflict in atom.xml
Signed-off-by: Martin Tzvetanov Grigorov <[email protected]>
---
content/atom.xml | 4 ----
1 file changed, 4 deletions(-)
diff --git a/content/atom.xml b/content/atom.xml
index 34a17de5..75067057 100644
--- a/content/atom.xml
+++ b/content/atom.xml
@@ -3,11 +3,7 @@
<title>Apache Wicket</title>
<link href="http://wicket.apache.org/atom.xml"; rel="self"/>
<link href="http://wicket.apache.org/"/>
-<<<<<<< HEAD
- <updated>2025-06-21T14:40:14+02:00</updated>
-=======
<updated>2025-07-12T19:16:30+00:00</updated>
->>>>>>> d4c12e8b (announce for 10.6.0)
<id>http://wicket.apache.org/</id>
<author>
<name>Apache Wicket</name>
