Passed
Push — master ( fd77ed...f01db1 )
by Bob
03:00
created
Dramiel.php 1 patch
Spacing   +2 added lines, -3 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@  discard block
 block discarded – undo
29 29
 // Setup logger
30 30
 use Monolog\Logger;
31 31
 use Monolog\Handler\StreamHandler;
32
-<<<<<<< HEAD
32
+<< << <<< HEAD
33 33
 
34 34
 use Discord\Discord;
35 35
 use Discord\Parts\Channel\Channel;
@@ -224,5 +224,4 @@  discard block
 block discarded – undo
224 224
         $logger->addInfo('Websocket was reconnected..');
225 225
 });
226 226
 // Now we will run the ReactPHP Event Loop!
227
-$ws->run();
228
-
227
+$ws->run
229 228
\ No newline at end of file
Please login to merge, or discard this patch.