Resolve merge conflicts while merging recent changes from branch 1.0 …

…into branch 1.1
uvdesk · Mar 23, 2022 · 25c5efe · 25c5efe
2 parents bea209c + c4fd02c
commit 25c5efe
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/Services/MailboxService.php b/Services/MailboxService.php
@@ -317,7 +317,9 @@ public function processMail($rawEmail)
                 // An exception being thrown means no mailboxes were found from the recipient's address. Continue processing.
             }
         }
-
+
+        $mailData['replyTo'] = '';
+
         foreach($addresses['to'] as $mailboxEmail){
             if($this->getMailboxByToEmail(strtolower($mailboxEmail))){
                 $mailData['replyTo'] = $mailboxEmail;

diff --git a/composer.json b/composer.json
@@ -20,10 +20,7 @@
         "psr-4": { "Webkul\\UVDesk\\MailboxBundle\\": "" }
     },
     "extra": {
-        "uvdesk-package-extension": "Webkul\\UVDesk\\MailboxBundle\\Package\\Composer",
-        "branch-alias": {
-            "dev-master": "1.1.x-dev"
-        }
+        "uvdesk-package-extension": "Webkul\\UVDesk\\MailboxBundle\\Package\\Composer"
     },
     "minimum-stability": "stable"
 }