From 7b9514dc5dcf8ae4c090583eb694134b705e0459 Mon Sep 17 00:00:00 2001
From: Alice Harris <alice.harris@oldgods.net>
Date: Sun, 11 Jan 2015 14:54:41 +1000
Subject: [PATCH] fix final bit of conflict

---
 views/shared/tasks/lists.jade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/shared/tasks/lists.jade b/views/shared/tasks/lists.jade
index 610c39be4e..ae28b99918 100644
--- a/views/shared/tasks/lists.jade
+++ b/views/shared/tasks/lists.jade
@@ -25,7 +25,7 @@ script(id='templates/habitrpg-tasks.html', type="text/ng-template")
           // Add New
           form.task-add(name='new{{list.type}}form', ng-hide='obj._locked', ng-submit='addTask(obj[list.type+"s"],list)')
             input(type='text', ng-model='list.newTask', placeholder='{{list.placeHolder}}', required)
-            input.addtask-btn(type='submit', value='＋', ng-disabled='new{{list.type}}form.$invalid')
+            button(type='submit', ng-disabled='new{{list.type}}form.$invalid')
               span.glyphicon.glyphicon-plus
 
           mixin taskColumnTabs(position)