From 203b962635a8cab111d077e08bdf906c79cad0c2 Mon Sep 17 00:00:00 2001 From: Contegix Support Date: Sun, 12 Apr 2015 18:27:21 -0500 Subject: [PATCH] updated site to current --- README.md | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/README.md b/README.md index 18055a0..f752b02 100644 --- a/README.md +++ b/README.md @@ -1,18 +1,4 @@ -<<<<<<< HEAD MattBurchett.com ============= -I have forked the JupiterColony.com repository from Rikai. I am putting my own spin on things, and making it my own as a landing page for myself. -======= -JupiterColony -============= - -Collaborative design of the JupiterColony landing page, a repository for the site and for design documents/goals. - -Notes -===== -Both active branches welcome merge requests tha make sense. @rikai and @ChrisLAS have final say on design decisions. - -* The master branch will contain style and content documents to help focus the direction, as this is a community effort. -* The gh-pages branch contains the actual site, and is what pull requests for changes to the live site should be filed against. ->>>>>>> 2a0d3f80ad2b6d2737581ecc5a983407bb088126 +I have forked the JupiterColony.com repository from Rikai. I am putting my own spin on things, and making it my own as a landing page for myself. \ No newline at end of file