rpicms

A CMS for the Raspberry Pi
git clone git://archive.git.mtrnord.blog/RpicmsTeam/rpicms.git
Log | Files | Refs | README | LICENSE
commit 1f4fdcc1900ae97f3d640573803d253d82c176f0
parent 5ff35d00edf46369015097a6c49f8e4bea0dcdd3
Author: Marcel <MTRNord@users.noreply.github.com>
Date:   Tue, 13 Oct 2015 06:33:13 +0200

Update README.md
Diffstat:

MREADME.md | 5+----


1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/README.md b/README.md
@@ -2,11 +2,8 @@ RPICMS
 ======
 
 [![Code Climate](https://codeclimate.com/github/RpicmsTeam/RPICMS/badges/gpa.svg)](https://codeclimate.com/github/RpicmsTeam/RPICMS) 
-<<<<<<< HEAD
 [![Build Status](https://travis-ci.org/RpicmsTeam/RPICMS.svg?branch=master)](https://travis-ci.org/RpicmsTeam/RPICMS)
-=======
-[![Build Status](https://travis-ci.org/RpicmsTeam/RPICMS.svg?branch=develop)](https://travis-ci.org/RpicmsTeam/RPICMS)
->>>>>>> refs/remotes/origin/develop
+
 Chats
 -----
 [![Join the chat at https://gitter.im/RpicmsTeam/RPICMS](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/RpicmsTeam/RPICMS?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)