You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flagon.apache.org by po...@apache.org on 2022/06/19 15:10:14 UTC
[incubator-flagon] 01/02: resolving merge conflicts
This is an automated email from the ASF dual-hosted git repository.
poorejc pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-flagon.git
commit 5211534c3e4bcbdf4b3da46ae452315b661dc1fd
Merge: 0b29210 0b26659
Author: poorejc <po...@apache.org>
AuthorDate: Sun Jun 19 11:08:57 2022 -0400
resolving merge conflicts
site/_docs/useralejs/index.md | 10 ++++++++--
site/_site/docs/useralejs/index.html | 9 +++++++--
site/_site/feed.xml | 1 -
3 files changed, 15 insertions(+), 5 deletions(-)
diff --cc site/_site/feed.xml
index ff34120,a34893a..b5fc7b9
--- a/site/_site/feed.xml
+++ b/site/_site/feed.xml
@@@ -1,2 -1,1 +1,1 @@@
-<?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-03T19:40:41+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 [...]
-