(wicket-site) branch asf-site updated: Resolve merge conflict in atom.xml

[solomax]

This is an automated email from the ASF dual-hosted git repository.

solomax 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 07f3d5ec Resolve merge conflict in atom.xml
07f3d5ec is described below

commit 07f3d5ec539456d9826aca989e414c3e399b402a
Author: Maxim Solodovnik <solo...@apache.org>
AuthorDate: Tue Jul 15 10:14:11 2025 +0700

    Resolve merge conflict in atom.xml
    
    Signed-off-by: Maxim Solodovnik <solo...@apache.org>
---
 content/atom.xml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/content/atom.xml b/content/atom.xml
index 75067057..3250037c 100644
--- a/content/atom.xml
+++ b/content/atom.xml
@@ -872,7 +872,6 @@ hZzNoF2E7tbktMsC0fSIoSQ6rCwrgeF0FTqZrkQuuKzMFJ1fdck=
 </content>
     </entry>
 
-<<<<<<< HEAD
     <entry>
         <title>Apache Wicket 9.18.0 released</title>
         <link 
href="http://wicket.apache.org/news/2024/06/01/wicket-9.18.0-released.html"/>
@@ -954,7 +953,5 @@ migration guide found at&lt;/p&gt;
 
 </content>
     </entry>
-
-=======
->>>>>>> d4c12e8b (announce for 10.6.0)
 </feed>
+