From f65e2a92eb4e2feb1abfef73b95179e25772f68e Mon Sep 17 00:00:00 2001 From: Hashem Mo Date: Sat, 2 Mar 2019 18:41:27 +0330 Subject: [PATCH 1/2] Update Helper.php --- src/Helper.php | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/Helper.php b/src/Helper.php index 82edf59..4ba6426 100644 --- a/src/Helper.php +++ b/src/Helper.php @@ -20,16 +20,9 @@ public function removeComma(string $value) : string /** * Convert jalali date to gregorian date. -<<<<<<< HEAD * * @param string $jDate * @return null|string -======= - * - * @param string $jDate - * - * @return string ->>>>>>> 887ce24ebe1ee8290b5d72241060327179b371c1 */ public function toGregorian(string $jDate) : string { From 637c0258e2df6ac78ef5b74ed367d1f1a620c5a2 Mon Sep 17 00:00:00 2001 From: Hashem Mo Date: Sat, 2 Mar 2019 15:13:12 +0000 Subject: [PATCH 2/2] Apply fixes from StyleCI --- src/Helper.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Helper.php b/src/Helper.php index 4ba6426..3e9c0e7 100644 --- a/src/Helper.php +++ b/src/Helper.php @@ -20,8 +20,9 @@ public function removeComma(string $value) : string /** * Convert jalali date to gregorian date. - * - * @param string $jDate + * + * @param string $jDate + * * @return null|string */ public function toGregorian(string $jDate) : string