depau/HackMD
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix merge conflicts

Browse source
This commit is contained in:
Cheng-Han, Wu 2016-05-15 11:17:02 +08:00
parent b956ada24b
commit 93c6205aa6
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/response.js
View file

@ -126,11 +126,7 @@ function responseHackMD(res, note) {
twitter: config.twitter, twitter: config.twitter,
github: config.github, github: config.github,
gitlab: config.gitlab, gitlab: config.gitlab,
<<<<<<< HEAD
dropbox: config.dropbox dropbox: config.dropbox
=======
dropbox: config.dropbox,
>>>>>>> 930afdc33738a487bd9e596c5d35bc9f686eaaa1
}); });
var buf = html; var buf = html;
res.writeHead(200, { res.writeHead(200, {