DanySpin97 / PhpBotFramework

src/Utilities/Paginator.php

Spacing +2 added lines, -8 removed lines

@@ -18,7 +18,7 @@ 
 
 namespace PhpBotFramework\Utilities;
 
-<<<<<<< HEAD
+<< << <<< HEAD
 /**
  * \addtogroup Modules
  * @{
@@ -102,10 +102,4 @@ 
             }
         }
 
-        return $message;
-    }
-}
-
-/*
- * @}
- */
+        return $message
\ No newline at end of file

src/Localization/Button.php

Spacing +3 added lines, -3 removed lines

@@ -38,7 +38,7 @@ 
      * @param CoreBot $bot References to the bot that's using the inline keyboard.
      * @param array $buttons Buttons passed as inizialization.
      */
-    public function __construct(CoreBot &$bot, array $buttons = array())
+    public function __construct(CoreBot & $bot, array $buttons = array())
     {
         $this->bot = $bot;
 
@@ -55,7 +55,7 @@ 
     public function getBackButton(bool $json_serialized = true)
     {
         // Create the button
-        $inline_keyboard = [ 'inline_keyboard' =>
+        $inline_keyboard = ['inline_keyboard' =>
             [
                 [
                     [
@@ -90,7 +90,7 @@ 
     public function getBackSkipKeyboard(bool $json_serialized = true)
     {
         // Create the keyboard
-        $inline_keyboard = [ 'inline_keyboard' =>
+        $inline_keyboard = ['inline_keyboard' =>
             [
                 [
                     [

src/Entities/EntityAccess.php

Spacing +2 added lines, -4 removed lines

@@ -41,7 +41,7 @@ 
     /** \brief Check that the given offset exists or not */
     public function offsetExists($offset)
     {
-<<<<<<< HEAD
+<< << <<< HEAD
         return isset($this->container[$offset]);
     }
 
@@ -63,6 +63,4 @@ 
         }
 
         // If not return the data from the array after checking it is set
-        return isset($this->container[$offset]) ? $this->container[$offset] : null;
-    }
-}
+        return isset($this->container[$offset]) ? $this->container[$offset
\ No newline at end of file