sinacms / MultiHttp

src/Http.php

Spacing +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
      * @param $method
      * @return bool
      */
-    public static function hasBody($method){
+    public static function hasBody($method) {
         return in_array($method, array(self::POST, self::PUT, self::PATCH, self::OPTIONS));
     }
 }
\ No newline at end of file

src/MultiRequest.php

Spacing +2 added lines, -5 removed lines

@@ -15,7 +15,7 @@ 
  */
 class MultiRequest
 {
-<<<<<<< HEAD
+<< << <<< HEAD
 =======
     /**
      * @var [Response]
@@ -121,7 +121,4 @@ 
         curl_multi_close(self::$multiHandler);
         self::$requestPool = array();
         self::$multiHandler = null;
-        return $return;
-    }
-
-}
+        return $return
\ No newline at end of file

src/Request.php

Spacing +2 added lines, -7 removed lines

@@ -15,7 +15,7 @@ 
 
 class Request extends Http
 {
-<<<<<<< HEAD
+<< << <<< HEAD
     const MAX_REDIRECTS_DEFAULT = 10;
 =======
     /**
@@ -683,9 +683,4 @@ 
     {
         if ($response->hasErrors()) {
             self::$logger->error($response->request->getURI() . "\t" . $response->error, array(
-                'response' => print_r($response, 1),
-            ));
-        }
-
-    }
-}
+                'response' => print_r($response
\ No newline at end of file