Repository: incubator-senssoft
Updated Branches:
  refs/heads/asf-site 9f8090077 -> f0ef9d4df


Push updates from site to deploy


Project: http://git-wip-us.apache.org/repos/asf/incubator-senssoft/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-senssoft/commit/f0ef9d4d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-senssoft/tree/f0ef9d4d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-senssoft/diff/f0ef9d4d

Branch: refs/heads/asf-site
Commit: f0ef9d4dfc53b33c9ca8c0450628027214bdaced
Parents: 9f80900
Author: Lewis John McGibbney <lewis.mcgibb...@gmail.com>
Authored: Mon Mar 12 09:03:47 2018 -0700
Committer: Lewis John McGibbney <lewis.mcgibb...@gmail.com>
Committed: Mon Mar 12 09:03:47 2018 -0700

----------------------------------------------------------------------
 site/_site/feed.xml            |  2 +-
 site/_site/releases/index.html | 13 -------------
 2 files changed, 1 insertion(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-senssoft/blob/f0ef9d4d/site/_site/feed.xml
----------------------------------------------------------------------
diff --git a/site/_site/feed.xml b/site/_site/feed.xml
index b9b560c..b663147 100644
--- a/site/_site/feed.xml
+++ b/site/_site/feed.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="utf-8"?><?xml-stylesheet type="text/xml" 
href="http://senssoft.incubator.apache.org/feed.xslt.xml";?><feed 
xmlns="http://www.w3.org/2005/Atom";><generator uri="http://jekyllrb.com"; 
version="3.3.1">Jekyll</generator><link 
href="http://senssoft.incubator.apache.org/feed.xml"; rel="self" 
type="application/atom+xml" /><link 
href="http://senssoft.incubator.apache.org/"; rel="alternate" type="text/html" 
/><updated>2018-03-09T19:13:44+00:00</updated><id>http://senssoft.incubator.apache.org//</id><title
 type="html">Apache SensSoft</title><subtitle>The homepage for Apache 
SensSoft</subtitle></feed>
+<?xml version="1.0" encoding="utf-8"?><?xml-stylesheet type="text/xml" 
href="http://senssoft.incubator.apache.org/feed.xslt.xml";?><feed 
xmlns="http://www.w3.org/2005/Atom";><generator uri="http://jekyllrb.com"; 
version="3.3.1">Jekyll</generator><link 
href="http://senssoft.incubator.apache.org/feed.xml"; rel="self" 
type="application/atom+xml" /><link 
href="http://senssoft.incubator.apache.org/"; rel="alternate" type="text/html" 
/><updated>2018-03-12T16:02:13+00:00</updated><id>http://senssoft.incubator.apache.org//</id><title
 type="html">Apache SensSoft</title><subtitle>The homepage for Apache 
SensSoft</subtitle></feed>

http://git-wip-us.apache.org/repos/asf/incubator-senssoft/blob/f0ef9d4d/site/_site/releases/index.html
----------------------------------------------------------------------
diff --git a/site/_site/releases/index.html b/site/_site/releases/index.html
index 72c4b75..e045955 100644
--- a/site/_site/releases/index.html
+++ b/site/_site/releases/index.html
@@ -151,22 +151,9 @@ The link in the 'Download Artifact' column below should 
display a default mirror
        </code>
 </p>
 
-<<<<<<< HEAD
-    <p>
-  You can always find current SensSoft code in our <a 
href="http://incubator.apache.org/projects/senssoft.html";>git repositories</a>, 
or on <a href="https://github.com/apache?q=senssoft";>github</a>.
-</p>
-
-<a class="ui blue button" 
href="mailto:dev-subscr...@senssoft.incubator.apache.org";>
-  Dev List
-</a>
-<a class="ui yellow button" 
href="mailto:users-subscr...@senssoft.incubator.apache.org";>
-  User List
-</a>
-=======
 <p>
        The files in the most recent release are signed by Lewis John McGibbney 
(CODE SIGNING KEY) lewi...@apache.org 48BAEBF6
 </p>
->>>>>>> master
 
 <h2>SHA512 Signatures</h2>
 <p>

Reply via email to