shibdib / Dramiel

src/lib/Db.php

Doc Comments +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
  */
 
 /**
- * @param null $db
+ * @param string|null $db
  * @return null|PDO
  */
 function openDB($db = null)

Dramiel.php

Doc Comments +1 added lines, -2 removed lines

@@ -224,5 +224,4 @@
         $logger->addInfo('Websocket was reconnected..');
 });
 // Now we will run the ReactPHP Event Loop!
-$ws->run();
-
+$ws->run
\ No newline at end of file

Spacing +2 added lines, -3 removed lines

@@ -29,7 +29,7 @@ 
 // Setup logger
 use Monolog\Logger;
 use Monolog\Handler\StreamHandler;
-<<<<<<< HEAD
+<< << <<< HEAD
 
 use Discord\Discord;
 use Discord\Parts\Channel\Channel;
@@ -224,5 +224,4 @@ 
         $logger->addInfo('Websocket was reconnected..');
 });
 // Now we will run the ReactPHP Event Loop!
-$ws->run();
-
+$ws->run
\ No newline at end of file