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 1

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/utils/Minify.js
View file

@ -261,7 +261,6 @@ function getAceFile(callback) {
// them into the file.
async.forEach(founds, function (item, callback) {
var filename = item.match(/"([^"]*)"/)[1];
var request = require('request');
var baseURI = 'http://localhost:' + settings.port;
var resourceURI = baseURI + path.normalize(path.join('/static/', filename));