From 67538706ed0d5f5521f13fd5a080e0db30be5d6a Mon Sep 17 00:00:00 2001
From: Chris Boden <cboden@gmail.com>
Date: Tue, 8 Nov 2011 09:39:25 -0500
Subject: [PATCH] Revert "Merge branch 'dev' of github.com:cboden/Ratchet into
 dev"

This reverts commit b31a65a99a61faa69ea0d43d3c3aa7051db05674, reversing
changes made to 68a618c1cde3f5109448f36ae369e3cf261a2091.
---
 lib/Ratchet/Protocol/WebSocket.php | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/lib/Ratchet/Protocol/WebSocket.php b/lib/Ratchet/Protocol/WebSocket.php
index 24ea8d8..c788a66 100644
--- a/lib/Ratchet/Protocol/WebSocket.php
+++ b/lib/Ratchet/Protocol/WebSocket.php
@@ -126,7 +126,6 @@ class WebSocket implements ProtocolInterface {
         if ($command instanceof SendMessage) {
             $version = $this->_clients[$command->getSocket()]->getVersion();
             return $command->setMessage($version->frame($command->getMessage()));
-<<<<<<< HEAD
         }
 
         if ($command instanceof \Traversable) {
@@ -135,16 +134,6 @@ class WebSocket implements ProtocolInterface {
             }
         }
 
-=======
-        }
-
-        if ($command instanceof \Traversable) {
-            foreach ($command as $cmd) {
-                $cmd = $this->prepareCommand($cmd);
-            }
-        }
-
->>>>>>> 1d14119bb5582cf8ebfd7c506cbb93f3368ce852
         return $command;
     }