gabrielbull / php-ups-api

src/Entity/InternationalForms.php

Unused Use Statements +1 added lines, -4 removed lines

@@ -616,7 +616,4 @@
     {
         $this->declarationStatement = $statement;
 
-        return $this;
-    }
->>>>>>> develop
-}
+        return $this
\ No newline at end of file

Spacing +5 added lines, -8 removed lines

@@ -151,16 +151,16 @@ 
      * @var EEIFilingOption
      */
     private $eeiFilingOption;
-=======
+=== === =
      * @var OtherCharges
-     */
+     * /
     private $otherCharges;
 
     /**
      * @var string $declarationStatement
      */
     private $declarationStatement;
->>>>>>> develop
+>> >> >> > develop
 
     /**
      * @return array
@@ -210,7 +210,7 @@ 
             if (isset($attributes->CurrencyCode)) {
                 $this->setCurrencyCode($attributes->CurrencyCode);
             }
-<<<<<<< HEAD
+<< << <<< HEAD
             if (isset($attributes->EEIFilingOption)) {
                 $this->setEEIFilingOption(new EEIFilingOption($attributes->EEIFilingOption));
 =======
@@ -616,7 +616,4 @@ 
     {
         $this->declarationStatement = $statement;
 
-        return $this;
-    }
->>>>>>> develop
-}
+        return $this
\ No newline at end of file