I got 99 problems and apparently a merge is one.

amabnl · Jan 29, 2016 · 24de4c4 · 24de4c4
1 parent 5c85177
commit 24de4c4
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 31 deletions.
diff --git a/src/Amadeus/Client/Struct/Pnr/AddMultiElements/AirAuxItinerary.php b/src/Amadeus/Client/Struct/Pnr/AddMultiElements/AirAuxItinerary.php
@@ -22,12 +22,9 @@
 
 namespace Amadeus\Client\Struct\Pnr\AddMultiElements;
 
-<<<<<<< HEAD
-=======
 use Amadeus\Client\RequestOptions\Pnr\Segment;
 use Amadeus\Client\Struct\InvalidArgumentException;
 
->>>>>>> develop
 /**
  * AirAuxItinerary
  * 
@@ -56,8 +53,6 @@ class AirAuxItinerary
      * @var FreetextItinerary
      */
     public $freetextItinerary;
-<<<<<<< HEAD
-=======
 
     /**
      * AirAuxItinerary constructor.
@@ -104,5 +99,4 @@ protected function loadAir(Segment\Air $segment)
     {
         throw new \RuntimeException('NOT YET IMPLEMENTED');
     }
->>>>>>> develop
 }
diff --git a/src/Amadeus/Client/Struct/Pnr/AddMultiElements/ElementManagementItinerary.php b/src/Amadeus/Client/Struct/Pnr/AddMultiElements/ElementManagementItinerary.php
@@ -30,14 +30,12 @@
  */
 class ElementManagementItinerary
 {
-<<<<<<< HEAD
-=======
     const SEGMENT_MISCELLANEOUS = "RU";
 
     const SEGMENT_AIR = "AIR";
 
     const SEGMENT_HOTEL_AUX = "HU";
->>>>>>> develop
+
     /**
      * @var Reference
      */
@@ -93,8 +91,6 @@ class ElementManagementItinerary
       * @var string
       */
     public $segmentName;
-<<<<<<< HEAD
-=======
 
     /**
      * ElementManagementItinerary constructor.
@@ -107,5 +103,4 @@ public function __construct($tatooNr, $segmentName)
         $this->segmentName = $segmentName;
         $this->reference = new Reference(Reference::QUAL_OTHER, $tatooNr);
     }
->>>>>>> develop
 }
diff --git a/src/Amadeus/Client/Struct/Pnr/AddMultiElements/FreetextItinerary.php b/src/Amadeus/Client/Struct/Pnr/AddMultiElements/FreetextItinerary.php
@@ -30,9 +30,6 @@
  */
 class FreetextItinerary
 {
-<<<<<<< HEAD
-
-=======
     /**
      * @var FreetextDetail
      */
@@ -53,5 +50,4 @@ public function __construct($freeText)
         $this->longFreetext = $freeText;
         $this->freetextDetail = new FreetextDetail(null);
     }
->>>>>>> develop
 }
diff --git a/src/Amadeus/Client/Struct/Pnr/AddMultiElements/ItineraryInfo.php b/src/Amadeus/Client/Struct/Pnr/AddMultiElements/ItineraryInfo.php
@@ -43,8 +43,6 @@ class ItineraryInfo
      * @var
      */
     public $referenceForSegment;
-<<<<<<< HEAD
-=======
 
     /**
      * ItineraryInfo constructor.
@@ -56,5 +54,4 @@ public function __construct($tatooNr, $segmentName)
     {
         $this->elementManagementItinerary = new ElementManagementItinerary($tatooNr, $segmentName);
     }
->>>>>>> develop
 }
diff --git a/src/Amadeus/Client/Struct/Pnr/AddMultiElements/MessageAction.php b/src/Amadeus/Client/Struct/Pnr/AddMultiElements/MessageAction.php
@@ -30,9 +30,6 @@
  */
 class MessageAction
 {
-<<<<<<< HEAD
-
-=======
     /**
      * @var Business
      */
@@ -47,5 +44,4 @@ public function __construct($businessFunction)
     {
         $this->business = new Business($businessFunction);
     }
->>>>>>> develop
 }
diff --git a/src/Amadeus/Client/Struct/Pnr/AddMultiElements/RelatedProduct.php b/src/Amadeus/Client/Struct/Pnr/AddMultiElements/RelatedProduct.php
@@ -30,9 +30,6 @@
  */
 class RelatedProduct
 {
-<<<<<<< HEAD
-
-=======
     const STATUS_CONFIRMED = "HK";
 
     public $quantity;
@@ -113,5 +110,4 @@ public function __construct($status, $quantity = 1)
         $this->status = $status;
         $this->quantity = $quantity;
     }
->>>>>>> develop
 }
diff --git a/src/Amadeus/Client/Struct/Pnr/AddMultiElements/TravelProduct.php b/src/Amadeus/Client/Struct/Pnr/AddMultiElements/TravelProduct.php
@@ -30,9 +30,6 @@
  */
 class TravelProduct
 {
-<<<<<<< HEAD
-
-=======
     /**
      * date and time details
      *
@@ -97,5 +94,4 @@ public function __construct($date, $cityCode, $company)
 
         $this->company = new Company($company);
     }
->>>>>>> develop
 }