status-im/codimd
2
0
Fork 0
mirror of https://github.com/status-im/codimd.git synced 2025-01-11 16:34:33 +00:00
Code Issues Projects 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,
github: config.github,
gitlab: config.gitlab,
<<<<<<< HEAD
dropbox: config.dropbox
=======
dropbox: config.dropbox,
>>>>>>> 930afdc33738a487bd9e596c5d35bc9f686eaaa1
});
var buf = html;
res.writeHead(200, {