diff options
Diffstat (limited to '')
-rw-r--r-- | lib/response.js | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/lib/response.js b/lib/response.js index bbc08e80..99cd080a 100644 --- a/lib/response.js +++ b/lib/response.js @@ -126,11 +126,7 @@ function responseHackMD(res, note) { twitter: config.twitter, github: config.github, gitlab: config.gitlab, -<<<<<<< HEAD dropbox: config.dropbox -======= - dropbox: config.dropbox, ->>>>>>> 930afdc33738a487bd9e596c5d35bc9f686eaaa1 }); var buf = html; res.writeHead(200, { |