From 68fcc024a4c0f973ab2b47e042ddc8459017bea6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20K=C3=A5gedal=20Reimer?= <skagedal@gmail.com>
Date: Wed, 11 Mar 2015 22:10:41 +0100
Subject: [PATCH] Fix broken merge

---
 build.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/build.rb b/build.rb
index 77bca10..4edb695 100644
--- a/build.rb
+++ b/build.rb
@@ -229,7 +229,6 @@ class Server
         listener
     end
 
-<<<<<<< HEAD
     def run(options)
         require 'webrick'
 	listener = options[:watch] && start_watcher