summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README.md2
1 files changed, 1 insertions, 1 deletions
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.
=====================================