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/03 13:51:22 UTC
[sling-site] branch master updated: Fixing bad merge
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
The following commit(s) were added to refs/heads/master by this push:
new 70f419a Fixing bad merge
70f419a is described below
commit 70f419ae840cb4ddee325c80200fa0fcfb912ed9
Author: Dan Klco <dk...@apache.org>
AuthorDate: Fri May 3 09:51:14 2019 -0400
Fixing bad merge
---
src/main/jbake/content/releases.md | 3 ---
1 file changed, 3 deletions(-)
diff --git a/src/main/jbake/content/releases.md b/src/main/jbake/content/releases.md
index d432319..2c027e8 100644
--- a/src/main/jbake/content/releases.md
+++ b/src/main/jbake/content/releases.md
@@ -8,11 +8,8 @@ This is a list of all our releases, available from our [downloads](/downloads.cg
## 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