commit 5b1f099d9a77c7aff198eda550e14eb8dd32267d
author Martin Tzvetanov Grigorov <mgrigorov@apache.org> Mon Jun 28 09:36:02 2021 +0300
committer Martin Tzvetanov Grigorov <mgrigorov@apache.org> Mon Jun 28 09:36:02 2021 +0300
tree ac320b8dc6399c60b8f0f4f0b75e976e531ec019
parent c72de49462f629498cb83424511c9122afe75da8

Resolve merge conflict.

content/atom.xml

diff --git a/content/atom.xml b/content/atom.xml
index 0c834d7..68d6b20 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>2021-06-27T22:41:41+02:00</updated>
-=======
-    <updated>2021-04-19T12:25:00+03:00</updated>
->>>>>>> dc7ac3db43b90dd9c2e64c1791a90e91fdde8c74
     <id>http://wicket.apache.org/</id>
     <author>
         <name>Apache Wicket</name>