From cee53d0f2d93bc1068708e57141607f014e0a7ca Mon Sep 17 00:00:00 2001 From: Thomas Reynolds Date: Mon, 4 May 2015 10:02:32 -0700 Subject: [PATCH] Fix bad merge from v3-stable --- middleman-core/lib/middleman-core/preview_server.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/middleman-core/lib/middleman-core/preview_server.rb b/middleman-core/lib/middleman-core/preview_server.rb index 2d71f99e..584001ca 100644 --- a/middleman-core/lib/middleman-core/preview_server.rb +++ b/middleman-core/lib/middleman-core/preview_server.rb @@ -131,10 +131,10 @@ module Middleman @host = app.config[:host] @port = app.config[:port] - @https = @app.config[:https] + @https = app.config[:https] - @ssl_certificate = @app.config[:ssl_certificate] - @ssl_private_key = @app.config[:ssl_private_key] + @ssl_certificate = app.config[:ssl_certificate] + @ssl_private_key = app.config[:ssl_private_key] app.files.on_change :reload do $mm_reload = true