merge master

RTLer · Jan 17, 2018 · af892c5 · af892c5
1 parent 61d7996
commit af892c5
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/src/Zarinpal.php b/src/Zarinpal.php
@@ -83,11 +83,7 @@ public function verify($status, $amount, $authority)
 
     public function redirect()
     {
-<<<<<<< Updated upstream
-        header('Location: '.$this->redirectUrl.$this->Authority);
-=======
         header('Location: ' . sprintf($this->redirectUrl, $this->Authority));
->>>>>>> Stashed changes
         die;
     }