zgabievi / laravel-promocodes

src/Traits/Rewardable.php

Doc Comments +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
      * @param null  $reward
      * @param array $data
      *
-     * @return mixed
+     * @return \Illuminate\Support\Collection
      */
     public function createCode($amount = 1, $reward = null, array $data = [])
     {

src/Promocodes.php

Spacing +3 added lines, -3 removed lines

@@ -139,14 +139,14 @@
      * @return static
      */
     public function create($amount = 1, $reward = null, array $data = [])
-=======
+=== === =
      * @param int  $amount
      * @param null $reward
      *
      * @return static
-     */
+     * /
     public function create($amount = 1, $reward = null)
->>>>>>> 46cd444ffd48ecc5f447fb653487856224e958d6
+>> >> >> > 46cd444ffd48ecc5f447fb653487856224e958d6
     {
         $records = [];