don't think that was supposed to be there :)

2017-04-10 05:17:16 -04:00 · 2017-04-10 05:17:16 -04:00 · 0e0002e473
parent 354a7f8b76
commit 0e0002e473
1 changed files with 1 additions and 1 deletions
--- 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`