elf
/
grunt-couchapp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

well, i clearly did something

This commit is contained in:
Max Thayer 2013-08-21 23:54:41 -04:00
parent 7a9d8f85ca
commit 535902a71a
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tasks/couchapp.js
View File

@ -66,13 +66,8 @@ module.exports = function(grunt) {
} }
}); });
<<<<<<< HEAD
grunt.registerMultiTask("mkcouchdb", "Delete a Couch Database", function() {
var done, parts, nano, dbname, auth, _this;
=======
grunt.registerMultiTask("mkcouchdb", "Make a Couch Database", function() { grunt.registerMultiTask("mkcouchdb", "Make a Couch Database", function() {
var done, parts, nano, dbname, _this; var done, parts, nano, dbname, _this;
>>>>>>> fixed typo
_this = this; _this = this;
done = this.async(); done = this.async();