From a8729747f8e2c591b99edb9911f91653e9d30297 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 21 Apr 2017 16:55:00 -0700
Subject: [PATCH] (stable) Trivial edit to make `master` merge cleanly.

---
 src/applications/conpherence/editor/ConpherenceEditor.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/applications/conpherence/editor/ConpherenceEditor.php b/src/applications/conpherence/editor/ConpherenceEditor.php
index c53aab7655..e8239821c6 100644
--- a/src/applications/conpherence/editor/ConpherenceEditor.php
+++ b/src/applications/conpherence/editor/ConpherenceEditor.php
@@ -358,7 +358,6 @@ final class ConpherenceEditor extends PhabricatorApplicationTransactionEditor {
             $object,
             PhabricatorPolicyCapability::CAN_EDIT);
         }
-
         break;
       case ConpherenceThreadTitleTransaction::TRANSACTIONTYPE:
       case ConpherenceThreadTopicTransaction::TRANSACTIONTYPE: