From 0d4147fde58eaf1621f08ae67020c87071a58e3e Mon Sep 17 00:00:00 2001 From: xicubed Date: Tue, 28 Jan 2014 11:35:13 -0700 Subject: [PATCH 1/3] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index b7c1775..216e3b8 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,8 @@ RSS parser for Clojure. Modified to post to a Flipboard via a chromedriver https://code.google.com/p/selenium/wiki/ChromeDriver plug-in. +[![Build Status](https://travis-ci.org/xicubed/ariane.png?branch=master)](https://travis-ci.org/xicubed/ariane) + ## Usage Supports RSS 2.0 From 03450ce9b04f2873110353094df8636926ff6fad Mon Sep 17 00:00:00 2001 From: xicubed Date: Wed, 29 Jan 2014 13:03:54 -0700 Subject: [PATCH 2/3] just random start change will be updated anyhow --- lastrun.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lastrun.txt b/lastrun.txt index 3a8f53a..3bdb14b 100644 --- a/lastrun.txt +++ b/lastrun.txt @@ -1 +1 @@ -Tue, 29 Oct 2013 17:45:40 +0000 \ No newline at end of file +Mon, 11 Nov 2013 22:21:50 +0000 \ No newline at end of file From 8657a83ddbdce765993be9b95c79d184d6701673 Mon Sep 17 00:00:00 2001 From: xicubed Date: Wed, 29 Jan 2014 13:04:45 -0700 Subject: [PATCH 3/3] just date stuff was conflicted --- lastrun.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lastrun.txt b/lastrun.txt index 3bdb14b..778a5aa 100644 --- a/lastrun.txt +++ b/lastrun.txt @@ -1 +1,5 @@ -Mon, 11 Nov 2013 22:21:50 +0000 \ No newline at end of file +<<<<<<< HEAD +Mon, 11 Nov 2013 22:21:50 +0000 +======= +Fri, 24 Jan 2014 19:51:52 +0000 +>>>>>>> 0d4147fde58eaf1621f08ae67020c87071a58e3e