From 7f2bca2fd96eeaa161a72e29d57824b67f372cdd Mon Sep 17 00:00:00 2001
From: AJ ONeal <awesome@coolaj86.com>
Date: Fri, 7 Oct 2016 10:51:05 -0600
Subject: [PATCH] merge httpsOptions

---
 serve.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/serve.js b/serve.js
index a6a6f60..844bfb0 100755
--- a/serve.js
+++ b/serve.js
@@ -136,7 +136,7 @@ function run() {
   var email = argv.email;
   var agreeTos = argv.agreeTos || argv['agree-tos'];
 
-  var cert = require('localhost.daplie.com-certificates');
+  var cert = require('localhost.daplie.com-certificates').merge({});
   var opts = {
     key: cert.key
   , cert: cert.cert