diff options
| author | Cheng-Han, Wu | 2016-05-15 11:17:02 +0800 |
|---|---|---|
| committer | Cheng-Han, Wu | 2016-05-15 11:17:02 +0800 |
| commit | 93c6205aa62e06ed1fcdb1d54fa240b8008786f1 (patch) | |
| tree | 865e03f0f559b2b1a9b7497d8c403cc0f45a8b16 /lib | |
| parent | b956ada24bca26bc39769e20f45f4ecdebf42398 (diff) | |
Fix merge conflicts
Diffstat (limited to 'lib')
| -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, { |