mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-20 15:36:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 27

resolve merge conflict

Browse source
This commit is contained in:
John McLear 2014-12-29 01:54:44 +01:00
commit c4959b089f
18 changed files with 1 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/node/handler/ExportHandler.js
View file

@ -21,7 +21,6 @@
var ERR = require("async-stacktrace");
var exporthtml = require("../utils/ExportHtml");
var exporttxt = require("../utils/ExportTxt");
var padManager = require("../db/PadManager");
var async = require("async");
var fs = require("fs");
var settings = require('../utils/Settings');