Loading composer.json +1 −12 Original line number Diff line number Diff line Loading @@ -5,10 +5,6 @@ }, "sort-packages": true, "optimize-autoloader": true, <<<<<<< HEAD "classmap-authoritative": true, ======= >>>>>>> a46efa4aa6a96d152602a9c07152c6b785760c18 "autoloader-suffix": "Calendar", "allow-plugins": { "bamarni/composer-bin-plugin": true Loading Loading @@ -41,12 +37,5 @@ "bin-links": true, "forward-command": false } <<<<<<< HEAD }, "require-dev": { "nextcloud/coding-standard": "^1.0", "friendsofphp/php-cs-fixer": "^3.13" ======= >>>>>>> a46efa4aa6a96d152602a9c07152c6b785760c18 } } No newline at end of file composer.lock +1 −2215 File changed.Preview size limit exceeded, changes collapsed. Show changes Loading
composer.json +1 −12 Original line number Diff line number Diff line Loading @@ -5,10 +5,6 @@ }, "sort-packages": true, "optimize-autoloader": true, <<<<<<< HEAD "classmap-authoritative": true, ======= >>>>>>> a46efa4aa6a96d152602a9c07152c6b785760c18 "autoloader-suffix": "Calendar", "allow-plugins": { "bamarni/composer-bin-plugin": true Loading Loading @@ -41,12 +37,5 @@ "bin-links": true, "forward-command": false } <<<<<<< HEAD }, "require-dev": { "nextcloud/coding-standard": "^1.0", "friendsofphp/php-cs-fixer": "^3.13" ======= >>>>>>> a46efa4aa6a96d152602a9c07152c6b785760c18 } } No newline at end of file