This is an automated email from the ASF dual-hosted git repository.
git-site-role pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/sling-site.git
The following commit(s) were added to refs/heads/asf-site by this push:
new fca8a29 Automatic website deployment
fca8a29 is described below
commit fca8a29434201f71f7d6b75f291cbe3997d483c6
Author: jenkins <[email protected]>
AuthorDate: Fri May 3 13:53:00 2019 +0000
Automatic website deployment
---
releases.html | 25 ++++---------------------
1 file changed, 4 insertions(+), 21 deletions(-)
diff --git a/releases.html b/releases.html
index 170705c..5c9b6b9 100644
--- a/releases.html
+++ b/releases.html
@@ -71,26 +71,9 @@
Releases
</h1><div class="row"><div class="small-12 columns"><section
class="wrap"><p>This is a list of all our releases, available from our <a
href="/downloads.cgi">downloads</a> page.</p>
<h2><a href="#may-2019" name="may-2019">May 2019</a></h2>
-<p><<<<<<< HEAD</p>
-<h1>* Service User WebConsole 1.0.2, Repoinit Parser 1.2.4 and Repoinit JCR
1.1.10 (2nd)</h1>
-<ul>
- <li>
- <p>Sling Project Archetype 1.0.0 (2nd)</p>
- <blockquote>
- <blockquote>
- <blockquote>
- <blockquote>
- <blockquote>
- <blockquote>
- <blockquote>
- <p>0188cae8e2392307b6099a0248fc073adfcd2e24</p>
- </blockquote>
- </blockquote>
- </blockquote>
- </blockquote>
- </blockquote>
- </blockquote>
- </blockquote></li>
+<ul>
+ <li>Service User WebConsole 1.0.2, Repoinit Parser 1.2.4 and Repoinit JCR
1.1.10 (2nd)</li>
+ <li>Sling Project Archetype 1.0.0 (2nd)</li>
</ul>
<h2><a href="#april-2019" name="april-2019">April 2019</a></h2>
<ul>
@@ -1901,7 +1884,7 @@
</ul></section></div></div>
<footer class="footer">
<div class="revisionInfo">
- Last modified by <span class="author">Dan Klco</span> on
<span class="comment">Thu May 2 17:02:47 2019 -0500</span>
+ Last modified by <span class="author">Dan Klco</span> on
<span class="comment">Fri May 3 09:51:14 2019 -0400</span>
</div> <p>
Apache Sling, Sling, Apache, the Apache feather logo, and
the Apache Sling project logo are trademarks of The Apache Software Foundation.
All other marks mentioned may be trademarks or registered trademarks of their
respective owners.
</p><p>
