Fixed mysterious merge errors.

blacksmithgu · blacksmithgu · commit 22d3501a03d5 · 2014-06-14T11:39:06.000-05:00
diff --git a/app/api/calls/RoomManager.php b/app/api/calls/RoomManager.php
@@ -80,6 +80,7 @@ public static function addRoutes($app) {
             }
             
             $room->removeIndirect("Students", $student);
+
             header($header);
         });
         

Original file line number	Diff line number	Diff line change
`@@ -80,6 +80,7 @@ public static function addRoutes($app) {`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`$room->removeIndirect("Students", $student);`
	`83`	`+`
`83`	`84`	`header($header);`
`84`	`85`	`});`
`85`	`86`