From 1fccb0e83a06752a4e83b24963aed3ccfb1d999c Mon Sep 17 00:00:00 2001
From: Sudhakar Kumar
Date: Wed, 25 Oct 2017 16:23:46 +0530
Subject: Edited Readme

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index c417f53..6a5ebd5 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
-<<<<<<< HEAD
 OpenSkyPlanetarium plugin for Stellarium
+
 Low cost hardware and open source software setup for planetariums in schools.
 =====================================
 
-- 
cgit