update code merge

app/Classes/Modules/Announcements/DataTransferObjects/AnnouncementObject.php

@@ -3,11 +3,6 @@
 namespace App\Classes\Modules\Announcements\DataTransferObjects;
 
 use App\Classes\General\Interfaces\DataTransferObject;
-<<<<<<< HEAD
-use Carbon\Carbon;
-=======
->>>>>>> 0bbf0f9138ea46fcc96ec0e387fb5dd8a51f5438
-
 class AnnouncementObject implements DataTransferObject
 {
 

app/Classes/Modules/Segments/DataTransferObjects/SegmentObject.php

@@ -3,7 +3,6 @@
 namespace App\Classes\Modules\Segments\DataTransferObjects;
 
 use App\Classes\General\Interfaces\DataTransferObject;
-<<<<<<< HEAD
 
 class SegmentObject implements DataTransferObject
 {
@@ -24,27 +23,6 @@ class SegmentObject implements DataTransferObject
     {
         $this->name = $name;
         $this->company_module_id = $company_module_id;
-=======
-use App\Classes\ValueObjects\Constants\SegmentConstants;
-
-class SegmentObject implements DataTransferObject
-{
-    /** @var string */
-    private $name;
-
-    /** @var int|null */
-    private $type;
-
-    /**
-     * SegmentObject constructor.
-     * @param string $name
-     * @param int|null $type
-     */
-    public function __construct(string $name, ?int $type = SegmentConstants::STANDARD_SEGMENT)
-    {
-        $this->name = $name;
-        $this->type = $type;
->>>>>>> 0bbf0f9138ea46fcc96ec0e387fb5dd8a51f5438
     }
 
     /**
@@ -56,7 +34,6 @@ class SegmentObject implements DataTransferObject
     }
 
     /**
-<<<<<<< HEAD
      * @return string
      */
     public function getCompanyModuleId(): string
@@ -64,18 +41,4 @@ class SegmentObject implements DataTransferObject
         return $this->company_module_id;
     }
 
-=======
-     * @return int
-     */
-    public function getType(): int
-    {
-        return $this->type;
-    }
-
-
-
-
-
-
->>>>>>> 0bbf0f9138ea46fcc96ec0e387fb5dd8a51f5438
 }