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

Conflicts: build.rb
2015-03-11 22:03:43 +01:00 · 2015-03-11 22:03:43 +01:00 · f188aabf74
commit f188aabf74
parent 935ee4599f ae0d367775
1 changed files with 1 additions and 0 deletions
--- 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