From d4025db1e0f5e483a0d7406df52e7e9a4660c412 Mon Sep 17 00:00:00 2001
From: Max Thayer <garbados@gmail.com>
Date: Wed, 21 Aug 2013 23:49:53 -0400
Subject: [PATCH] fixed typo

---
 tasks/couchapp.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/tasks/couchapp.js b/tasks/couchapp.js
index c3c3415..acbaa5b 100644
--- a/tasks/couchapp.js
+++ b/tasks/couchapp.js
@@ -5,11 +5,12 @@
  * Licensed under the MIT license.
  */
 
-var path, couchapp, nanolib, urls;
+var path, couchapp, nanolib, urls, auth;
 
 path = require('path');
 couchapp = require('couchapp');
 urls = require('url');
+auth = require('../lib/auth');
 
 var genDB = function(db) {
   var parts, dbname, auth;
@@ -65,8 +66,13 @@ 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() {
+        var done, parts, nano, dbname, _this;
+>>>>>>> fixed typo
         _this = this;
 
         done = this.async();