Fix broken merge

2015-03-11 22:10:41 +01:00 · 2015-03-11 22:10:41 +01:00 · 68fcc024a4
commit 68fcc024a4
parent f188aabf74
1 changed files with 0 additions and 1 deletions
--- 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