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

Posted to commits@sling.apache.org by dk...@apache.org on 2019/05/02 22:05:13 UTC

[sling-site] 02/02: merging the latest from master

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

dklco pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-site.git

commit bd206017918a33b4d7b9ae04012035448a1eee47
Merge: 6be6e3f 0188cae
Author: Dan Klco <dk...@apache.org>
AuthorDate: Thu May 2 17:02:47 2019 -0500

    merging the latest from master

 src/main/jbake/content/releases.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --cc src/main/jbake/content/releases.md
index 22ebf05,b85d93f..d432319
--- a/src/main/jbake/content/releases.md
+++ b/src/main/jbake/content/releases.md
@@@ -8,7 -8,7 +8,11 @@@ This is a list of all our releases, ava
  
  ## May 2019
  
++<<<<<<< HEAD
 +* Service User WebConsole 1.0.2, Repoinit Parser 1.2.4 and Repoinit JCR 1.1.10 (2nd)
++=======
+ * Sling Project Archetype 1.0.0 (2nd)
++>>>>>>> 0188cae8e2392307b6099a0248fc073adfcd2e24
  
  ## April 2019