You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2021/06/28 06:36:22 UTC
[wicket-site] branch asf-site updated: Resolve merge conflict.
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 5b1f099 Resolve merge conflict.
5b1f099 is described below
commit 5b1f099d9a77c7aff198eda550e14eb8dd32267d
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
AuthorDate: Mon Jun 28 09:36:02 2021 +0300
Resolve merge conflict.
---
content/atom.xml | 4 ----
1 file changed, 4 deletions(-)
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>