Skip to content

Minds Backend - Engine
Minds Backend - Engine
Commit a292ce4d authored by Olivia Madrid's avatar Olivia Madrid
Browse files
Options

(wip): Referrals console - fix merge conflict

parent e9ee0597
epic/referrals
1 merge request!236WIP: epic/referrals
Pipeline #69462366 failed with stages
          in 3 minutes and 57 seconds
          Hide whitespace changes
          Inline Side-by-side
          Showing with 0 additions and 7 deletions
          Core/Referrals/Manager.php
          View file @ a292ce4d
          ......@@ -62,12 +62,9 @@ class Manager
          {
          $this->repository->add($referral);
          <<<<<<< HEAD
          // Send a notification to the referrer
          $this->notificationDelegate->send($referral);
          =======
          >>>>>>> 314232eec078b2da38dc518fe260a53ce87f1e63
          return true;
          }
          ......@@ -78,14 +75,10 @@ class Manager
          */
          public function update($referral)
          {
          <<<<<<< HEAD
          $this->repository->update($referral);
          // Send a notification to the referrer
          $this->notificationDelegate->send($referral);
          =======
          $this->repository->update($referral);
          >>>>>>> 314232eec078b2da38dc518fe260a53ce87f1e63
          return true;
          }
          ......
          Markdown is supported
          0% or
          You are about to add 0 people to the discussion. Proceed with caution.
          Finish editing this message first!
          Please register or to comment