Merge branch '5.4RC'5.4

1 files changed, 2 insertions, 2 deletions

diff --git a/vendor/sabre/vobject/bin/mergeduplicates.php b/vendor/sabre/vobject/bin/mergeduplicates.php
index e6cde73dd..31b2c14ab 100755
--- a/vendor/sabre/vobject/bin/mergeduplicates.php
+++ b/vendor/sabre/vobject/bin/mergeduplicates.php
@@ -19,7 +19,7 @@ foreach ($paths as $path) {
 
 if (!class_exists('Sabre\\VObject\\Version')) {
     fwrite(STDERR, "Composer autoloader could not be loaded.\n");
-    die(1);
+    exit(1);
 }
 
 echo 'sabre/vobject ', Version::VERSION, " duplicate contact merge tool\n";
@@ -27,7 +27,7 @@ echo 'sabre/vobject ', Version::VERSION, " duplicate contact merge tool\n";
 if ($argc < 3) {
     echo "\n";
     echo 'Usage: ', $argv[0], " input.vcf output.vcf [debug.log]\n";
-    die(1);
+    exit(1);
 }
 
 $input = fopen($argv[1], 'r');