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

poorejc pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-flagon.git

commit 0b29210a1ae8abd8b9ba5f84d92ccfeddf17c64d
Merge: 36c8571 f218205
Author: poorejc <[email protected]>
AuthorDate: Wed Jun 23 23:33:35 2021 -0400

    fixing merge for UserALE.js 2.2.0 site updates

 content/feed.xml               |  2 +-
 content/releases/index.html    | 30 +++++++++++++-----------------
 site/_pages/releases.html      | 30 +++++++++++++-----------------
 site/_site/feed.xml            |  3 ++-
 site/_site/releases/index.html | 30 +++++++++++++-----------------
 5 files changed, 42 insertions(+), 53 deletions(-)

diff --cc site/_site/feed.xml
index 8d6aa68,b5fc7b9..ff34120
--- a/site/_site/feed.xml
+++ b/site/_site/feed.xml
@@@ -1,1 -1,1 +1,2 @@@
- <?xml version="1.0" encoding="utf-8"?><?xml-stylesheet type="text/xml" 
href="http://flagon.incubator.apache.org/feed.xslt.xml";?><feed 
xmlns="http://www.w3.org/2005/Atom";><generator uri="http://jekyllrb.com"; 
version="3.6.3">Jekyll</generator><link 
href="http://flagon.incubator.apache.org/feed.xml"; rel="self" 
type="application/atom+xml" /><link href="http://flagon.incubator.apache.org/"; 
rel="alternate" type="text/html" 
/><updated>2021-04-17T01:35:35+00:00</updated><id>http://flagon.incuba [...]
+ <?xml version="1.0" encoding="utf-8"?><?xml-stylesheet type="text/xml" 
href="http://flagon.incubator.apache.org/feed.xslt.xml";?><feed 
xmlns="http://www.w3.org/2005/Atom";><generator uri="http://jekyllrb.com"; 
version="3.6.3">Jekyll</generator><link 
href="http://flagon.incubator.apache.org/feed.xml"; rel="self" 
type="application/atom+xml" /><link href="http://flagon.incubator.apache.org/"; 
rel="alternate" type="text/html" 
/><updated>2021-06-24T03:22:45+00:00</updated><id>http://flagon.incuba [...]
++

Reply via email to