From 0e0002e473eb8bd65aafc1f4c8218a6c3ee7f5f4 Mon Sep 17 00:00:00 2001 From: Avraham David Gelbfish Date: Mon, 10 Apr 2017 05:17:16 -0400 Subject: [PATCH] don't think that was supposed to be there :) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8b4bf9e..2c6748e 100755 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ The Haspbian image is built with the same script that generates the official [Ra By default the Haspbian image is built on a Debian 8 droplet on Digital Ocean and takes about 30 minutes to build on the cheapest droplet. Dependencies and everything is handled by the build script with the exception of `git`. -<<<<<<< HEAD + Build instructions: - Install git. `sudo apt-get update && sudo apt-get upgrade -y && sudo apt-get install git` - Clone the `rpi_gen` code. `git clone https://github.com/home-assistant/pi-gen.git`