From 2ba35bb0d41e8a1a4854a831bc545fff20d7fe6f Mon Sep 17 00:00:00 2001
From: "Jens W. Klein" <jk@kleinundpartner.at>
Date: Sun, 17 Aug 2014 04:54:12 +0200
Subject: [PATCH] merge fixed

---
 plone/app/discussion/browser/comments.pt | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/plone/app/discussion/browser/comments.pt b/plone/app/discussion/browser/comments.pt
index fa2c6b2..ceb50de 100644
--- a/plone/app/discussion/browser/comments.pt
+++ b/plone/app/discussion/browser/comments.pt
@@ -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">