summaryrefslogtreecommitdiff
path: root/README.md
diff options
context:
space:
mode:
authorSudhakarKuma2017-10-25 16:18:24 +0530
committerSudhakarKuma2017-10-25 16:18:24 +0530
commit04dedd32d57b58ab0f9e1191bbc22a0ba601a4fb (patch)
tree7bf36da097d3297a09aadc1251eb8597246f1e11 /README.md
parenta33c7a4da90a609064feb368a7e9097c7a9d8202 (diff)
parent66ccb1539ceeb573d834c7f9d8ba451e0467482b (diff)
downloadOpen-Sky-Planetarium-04dedd32d57b58ab0f9e1191bbc22a0ba601a4fb.tar.gz
Open-Sky-Planetarium-04dedd32d57b58ab0f9e1191bbc22a0ba601a4fb.tar.bz2
Open-Sky-Planetarium-04dedd32d57b58ab0f9e1191bbc22a0ba601a4fb.zip
Updated OSP-plugin
Diffstat (limited to 'README.md')
-rw-r--r--README.md4
1 files changed, 4 insertions, 0 deletions
diff --git a/README.md b/README.md
index c3bb151..c417f53 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,6 @@
+<<<<<<< HEAD
OpenSkyPlanetarium plugin for Stellarium
+Low cost hardware and open source software setup for planetariums in schools.
=====================================
Plugin for controlling the Arduino-Based Laser and Stellarium to create Planetarium shows.
@@ -33,3 +35,5 @@ If all goes well, the relevant files should be built and copied to your
~/.stellarium/modules directory.
+=======
+