merge fixed

This commit is contained in:
Jens W. Klein 2014-08-17 04:54:12 +02:00
parent 62b2990b7c
commit 2ba35bb0d4

View File

@ -89,7 +89,6 @@
<form name="delete"
action=""
method="post"
style="display: inline;"
class="commentactionsform"
tal:condition="python: not canDelete and view.could_delete_own(reply)"
tal:attributes="action string:${reply/absolute_url}/@@delete-own-comment;
@ -104,8 +103,6 @@
<form name="delete"
action=""
method="post"
style="display: inline;"
tal:condition="canReview"
class="commentactionsform"
tal:condition="python:canDelete"
tal:attributes="action string:${reply/absolute_url}/@@moderate-delete-comment">