From b200c3bd787e1f8157ea5459000d34771088eab6 Mon Sep 17 00:00:00 2001
From: Bob Trahan <btrahan@phacility.com>
Date: Mon, 30 Mar 2015 16:29:08 -0700
Subject: [PATCH] Conpherence - actually remove route from feedback in D12215

Summary: pebkac issue of some sort and I didn't actually commit removing the defunct /conpherence/room/ uri route

Test Plan: made a new room and it worked

Reviewers: chad, epriestley

Reviewed By: epriestley

Subscribers: Korvin, epriestley

Differential Revision: https://secure.phabricator.com/D12216
---
 .../application/PhabricatorConpherenceApplication.php        | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/applications/conpherence/application/PhabricatorConpherenceApplication.php b/src/applications/conpherence/application/PhabricatorConpherenceApplication.php
index bcfd164c14..4ad640896a 100644
--- a/src/applications/conpherence/application/PhabricatorConpherenceApplication.php
+++ b/src/applications/conpherence/application/PhabricatorConpherenceApplication.php
@@ -36,10 +36,7 @@ final class PhabricatorConpherenceApplication extends PhabricatorApplication {
         '(?P<id>[1-9]\d*)/'        => 'ConpherenceViewController',
         'columnview/'              => 'ConpherenceColumnViewController',
         'new/'                     => 'ConpherenceNewController',
-        'room/'                    => array(
-          '(?:query/(?P<queryKey>[^/]+)/)?' => 'ConpherenceRoomListController',
-          'new/'                            => 'ConpherenceNewRoomController',
-        ),
+        'room/new/'                => 'ConpherenceNewRoomController',
         'search/(?:query/(?P<queryKey>[^/]+)/)?'
            => 'ConpherenceRoomListController',
         'panel/'                   => 'ConpherenceNotificationPanelController',