fixed typo
This commit is contained in:
parent
14fca52c64
commit
8bd3f97cc0
|
@ -5,11 +5,12 @@
|
||||||
* Licensed under the MIT license.
|
* Licensed under the MIT license.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
var path, couchapp, nanolib, urls;
|
var path, couchapp, nanolib, urls, auth;
|
||||||
|
|
||||||
path = require('path');
|
path = require('path');
|
||||||
couchapp = require('couchapp');
|
couchapp = require('couchapp');
|
||||||
urls = require('url');
|
urls = require('url');
|
||||||
|
auth = require('../lib/auth');
|
||||||
|
|
||||||
var genDB = function(db) {
|
var genDB = function(db) {
|
||||||
var parts, dbname, auth;
|
var parts, dbname, auth;
|
||||||
|
@ -65,8 +66,13 @@ module.exports = function(grunt) {
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
grunt.registerMultiTask("mkcouchdb", "Delete a Couch Database", function() {
|
grunt.registerMultiTask("mkcouchdb", "Delete a Couch Database", function() {
|
||||||
var done, parts, nano, dbname, auth, _this;
|
var done, parts, nano, dbname, auth, _this;
|
||||||
|
=======
|
||||||
|
grunt.registerMultiTask("mkcouchdb", "Make a Couch Database", function() {
|
||||||
|
var done, parts, nano, dbname, _this;
|
||||||
|
>>>>>>> fixed typo
|
||||||
_this = this;
|
_this = this;
|
||||||
|
|
||||||
done = this.async();
|
done = this.async();
|
||||||
|
|
Loading…
Reference in New Issue