You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@wicket.apache.org by ad...@apache.org on 2021/06/27 20:49:24 UTC

[wicket-site] 02/02: Merge branch 'asf-site' of github.com:apache/wicket-site into asf-site

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

adelbene pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/wicket-site.git

commit c72de49462f629498cb83424511c9122afe75da8
Merge: 151c89f dc7ac3d
Author: Andrea Del Bene <ad...@apache.org>
AuthorDate: Sun Jun 27 22:49:08 2021 +0200

    Merge branch 'asf-site' of github.com:apache/wicket-site into asf-site

 .asf.yaml                |  3 +++
 content/atom.xml         | 24 ++++++++++++---------
 content/learn/index.html | 48 +++++++-----------------------------------
 learn/index.md           | 54 ++++++++----------------------------------------
 4 files changed, 33 insertions(+), 96 deletions(-)

diff --cc content/atom.xml
index 6d47304,f157816..0c834d7
--- a/content/atom.xml
+++ b/content/atom.xml
@@@ -3,7 -3,7 +3,11 @@@
      <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>