kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-06-27 19:53:36 +00:00
Code Issues Projects Releases Wiki Activity

Fix merge conflict.

Browse Source
This commit is contained in:
Michael Teeuw 2016-04-03 19:56:01 +02:00
parent ec7a4734df
commit 5554dce924
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@ -3,7 +3,6 @@ This version of the Magic Mirror software focusses on a modular plugin system. B
#WARNING: THIS VERSION IS IN A VERY EARLY STAGE. IT IS NOT COMPLETED YET. PLEASE USE THE MASTER BRANCH. #WARNING: THIS VERSION IS IN A VERY EARLY STAGE. IT IS NOT COMPLETED YET. PLEASE USE THE MASTER BRANCH.
<<<<<<< HEAD
##Usage ##Usage
1. Download the latest node version: 1. Download the latest node version:
`wget https://nodejs.org/dist/latest/node-v5.10.0-linux-armv6l.tar.gz` for Pi 1 `wget https://nodejs.org/dist/latest/node-v5.10.0-linux-armv6l.tar.gz` for Pi 1
@ -14,11 +13,6 @@ This version of the Magic Mirror software focusses on a modular plugin system. B
5. `npm install && npm start` (You may have to restart your terminal before this works) 5. `npm install && npm start` (You may have to restart your terminal before this works)
**Important:** `npm start` does NOT work via SSH you have to execute it in a terminal session running in a window-manager. **Important:** `npm start` does NOT work via SSH you have to execute it in a terminal session running in a window-manager.
=======
##Usage
1. Install [Node.js](https://nodejs.org/en/)
2. Execute `npm install && npm start`.
>>>>>>> e38dd346d9f796807ea71035c18e3533ec245ba6
##Configuration ##Configuration
1. Duplicate `config/config.js.sample` to `config/config.js`. 1. Duplicate `config/config.js.sample` to `config/config.js`.