From ba94069ac5e93914a8d72a2a89da80fb6ef583d8 Mon Sep 17 00:00:00 2001
From: tworrall <tworrall@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Tue, 6 Dec 2011 17:45:41 +0000
Subject: [PATCH] delete button wasn't showing up on default form for
 collaborators

---
 .../freemarker/edit/forms/defaultDeletePropertyForm.ftl         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/web/templates/freemarker/edit/forms/defaultDeletePropertyForm.ftl b/webapp/web/templates/freemarker/edit/forms/defaultDeletePropertyForm.ftl
index b541fd786..d46a1029b 100644
--- a/webapp/web/templates/freemarker/edit/forms/defaultDeletePropertyForm.ftl
+++ b/webapp/web/templates/freemarker/edit/forms/defaultDeletePropertyForm.ftl
@@ -27,7 +27,7 @@
             </p> 
         </#if>
         
-        <#if editConfiguration.propertySelectFromExisting = true && editConfiguration.propertyOfferCreateNewOption = true>
+        <#if editConfiguration.propertySelectFromExisting = true || editConfiguration.propertyOfferCreateNewOption = true>
             <p>
                 <input type="submit" id="delete" value="Delete" role="button "/>
             </p>