Fix merge conflicts

2016-05-15 11:17:02 +08:00 · 2016-05-15 11:17:02 +08:00 · 93c6205aa6
parent b956ada24b
commit 93c6205aa6
1 changed files with 0 additions and 4 deletions
--- 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, {