From 535902a71a4141feaa1fafa8d28051b6d4e8c11a Mon Sep 17 00:00:00 2001
From: Max Thayer <garbados@gmail.com>
Date: Wed, 21 Aug 2013 23:54:41 -0400
Subject: [PATCH] well, i clearly did something

---
 tasks/couchapp.js | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/tasks/couchapp.js b/tasks/couchapp.js
index acbaa5b..1d94ce7 100644
--- a/tasks/couchapp.js
+++ b/tasks/couchapp.js
@@ -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() {
         var done, parts, nano, dbname, _this;
->>>>>>> fixed typo
         _this = this;
 
         done = this.async();