Remove accidentally commited merge noise

makewebau · Oct 31, 2017 · 8cd3108 · 8cd3108
1 parent ea69211
commit 8cd3108
Showing 1 changed file with 0 additions and 8 deletions.
diff --git 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
  }
 
  /**