From 8cd310869a3fd1db9c4ce3e694cf32801bfbc4f2 Mon Sep 17 00:00:00 2001
From: Andrew Feeney <webspannerdev@gmail.com>
Date: Wed, 1 Nov 2017 08:40:46 +1100
Subject: [PATCH] Remove accidentally commited merge noise

---
 src/Shipper.php | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/Shipper.php b/src/Shipper.php
index d989e85..968704b 100644
--- a/src/Shipper.php
+++ b/src/Shipper.php
@@ -195,15 +195,7 @@ protected function red($message, $lineBreak = true)
 
     protected function getArgument()
     {
-<<<<<<< HEAD
-        if (!isset($this->arguments[1])) {
-            return;
-        }
-
-        return $this->arguments[1];
-=======
         return isset($this->arguments[1]) ? $this->arguments[1] : null;
->>>>>>> b1c58dafcc9cf4ac5eab5ea6e077528420ea5066
     }
 
     /**