Merge branch 'no_jekyll' of https://github.com/skagedal/manual into no_jekyll

Conflicts:
	build.rb

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