From a7ad34bd99a654cdbfb9dff852771ca0fffcd492 Mon Sep 17 00:00:00 2001 From: Matias Griese Date: Thu, 6 Sep 2018 09:18:34 +0300 Subject: [PATCH] Resolve merge conflicts --- composer_BACKUP_46658.json | 89 -------------------------------------- composer_BASE_46658.json | 76 -------------------------------- composer_LOCAL_46658.json | 78 --------------------------------- composer_REMOTE_46658.json | 82 ----------------------------------- 4 files changed, 325 deletions(-) delete mode 100644 composer_BACKUP_46658.json delete mode 100644 composer_BASE_46658.json delete mode 100644 composer_LOCAL_46658.json delete mode 100644 composer_REMOTE_46658.json diff --git a/composer_BACKUP_46658.json b/composer_BACKUP_46658.json deleted file mode 100644 index e4c680d78..000000000 --- a/composer_BACKUP_46658.json +++ /dev/null @@ -1,89 +0,0 @@ -{ - "name": "getgrav/grav", - "type": "project", - "description": "Modern, Crazy Fast, Ridiculously Easy and Amazingly Powerful Flat-File CMS", - "keywords": ["cms","flat-file cms","flat cms","flatfile cms","php"], - "homepage": "http://getgrav.org", - "license": "MIT", - "require": { - "php": ">=7.1.3", - "ext-json": "*", - "ext-mbstring": "*", - "ext-openssl": "*", - "ext-curl": "*", - "ext-zip": "*", - "symfony/polyfill-iconv": "^1.9", - "symfony/polyfill-php72": "^1.9", - "symfony/polyfill-php73": "^1.9", - - "psr/simple-cache": "^1.0", - "psr/http-message": "^1.0", - - "twig/twig": "~1.35", - "erusev/parsedown": "1.6.4", - "erusev/parsedown-extra": "~0.7", - "symfony/yaml": "~4.1", - "symfony/console": "~4.1", - "symfony/event-dispatcher": "~4.1", - "symfony/var-dumper": "~4.1", - "doctrine/cache": "^1.7", - "doctrine/collections": "^1.5", - "guzzlehttp/psr7": "^1.4", - "filp/whoops": "~2.2", - - "matthiasmullie/minify": "^1.3", - "monolog/monolog": "~1.0", - "gregwar/image": "2.*", - "donatj/phpuseragentparser": "~0.10", - "pimple/pimple": "~3.2", - "rockettheme/toolbox": "~1.4", - "maximebf/debugbar": "~1.15", - "league/climate": "^3.4", - "antoligy/dom-string-iterators": "^1.0", -<<<<<<< HEAD - "miljar/php-exif": "^0.6.3", - "composer/ca-bundle": "^1.0", - "dragonmantank/cron-expression": "^1.2", - "symfony/process": "^3.4" -======= - "miljar/php-exif": "^0.6.4", - "composer/ca-bundle": "^1.0" ->>>>>>> 1.6 - }, - "require-dev": { - "codeception/codeception": "^2.4", - "phpunit/php-code-coverage": "~6.0", - "fzaninotto/faker": "^1.8", - "victorjonsson/markdowndocs": "dev-master" - }, - "config": { - "platform": { - "php": "7.1.3" - } - }, - "repositories": [ - { - "type": "vcs", - "url": "https://github.com/trilbymedia/PHP-Markdown-Documentation-Generator" - } - ], - "autoload": { - "psr-4": { - "Grav\\": "system/src/Grav" - }, - "files": ["system/defines.php"] - }, - "archive": { - "exclude": ["VERSION"] - }, - "scripts": { - "post-create-project-cmd": "bin/grav install", - "test": "vendor/bin/codecept run unit", - "test-windows": "vendor\\bin\\codecept run unit" - }, - "extra": { - "branch-alias": { - "dev-develop": "1.x-dev" - } - } -} diff --git a/composer_BASE_46658.json b/composer_BASE_46658.json deleted file mode 100644 index fbd5106f7..000000000 --- a/composer_BASE_46658.json +++ /dev/null @@ -1,76 +0,0 @@ -{ - "name": "getgrav/grav", - "type": "project", - "description": "Modern, Crazy Fast, Ridiculously Easy and Amazingly Powerful Flat-File CMS", - "keywords": ["cms","flat-file cms","flat cms","flatfile cms","php"], - "homepage": "http://getgrav.org", - "license": "MIT", - "require": { - "php": ">=5.6.4", - "twig/twig": "~1.24", - "erusev/parsedown": "1.6.4", - "erusev/parsedown-extra": "~0.7", - "symfony/yaml": "~3.4", - "symfony/console": "~3.4", - "symfony/event-dispatcher": "~3.4", - "symfony/var-dumper": "~3.4", - "symfony/polyfill-iconv": "~1.0", - "doctrine/cache": "^1.6", - "doctrine/collections": "^1.4", - "psr/simple-cache": "^1.0", - "psr/http-message": "^1.0", - "guzzlehttp/psr7": "^1.4", - "filp/whoops": "~2.0", - "matthiasmullie/minify": "^1.3", - "monolog/monolog": "~1.0", - "gregwar/image": "2.*", - "donatj/phpuseragentparser": "~0.3", - "pimple/pimple": "~3.2", - "rockettheme/toolbox": "~1.4", - "maximebf/debugbar": "~1.10", - "ext-mbstring": "*", - "ext-openssl": "*", - "ext-curl": "*", - "ext-zip": "*", - "league/climate": "^3.2", - "antoligy/dom-string-iterators": "^1.0", - "miljar/php-exif": "^0.6.3", - "composer/ca-bundle": "^1.0" - }, - "require-dev": { - "codeception/codeception": "^2.1", - "phpunit/php-code-coverage": "~2.0", - "fzaninotto/faker": "^1.5", - "victorjonsson/markdowndocs": "dev-master" - }, - "config": { - "platform": { - "php": "5.6.4" - } - }, - "repositories": [ - { - "type": "vcs", - "url": "https://github.com/trilbymedia/PHP-Markdown-Documentation-Generator" - } - ], - "autoload": { - "psr-4": { - "Grav\\": "system/src/Grav" - }, - "files": ["system/defines.php"] - }, - "archive": { - "exclude": ["VERSION"] - }, - "scripts": { - "post-create-project-cmd": "bin/grav install", - "test": "vendor/bin/codecept run unit", - "test-windows": "vendor\\bin\\codecept run unit" - }, - "extra": { - "branch-alias": { - "dev-develop": "1.x-dev" - } - } -} diff --git a/composer_LOCAL_46658.json b/composer_LOCAL_46658.json deleted file mode 100644 index 76885b077..000000000 --- a/composer_LOCAL_46658.json +++ /dev/null @@ -1,78 +0,0 @@ -{ - "name": "getgrav/grav", - "type": "project", - "description": "Modern, Crazy Fast, Ridiculously Easy and Amazingly Powerful Flat-File CMS", - "keywords": ["cms","flat-file cms","flat cms","flatfile cms","php"], - "homepage": "http://getgrav.org", - "license": "MIT", - "require": { - "php": ">=5.6.4", - "twig/twig": "~1.24", - "erusev/parsedown": "1.6.4", - "erusev/parsedown-extra": "~0.7", - "symfony/yaml": "~3.4", - "symfony/console": "~3.4", - "symfony/event-dispatcher": "~3.4", - "symfony/var-dumper": "~3.4", - "symfony/polyfill-iconv": "~1.0", - "doctrine/cache": "^1.6", - "doctrine/collections": "^1.4", - "psr/simple-cache": "^1.0", - "psr/http-message": "^1.0", - "guzzlehttp/psr7": "^1.4", - "filp/whoops": "~2.0", - "matthiasmullie/minify": "^1.3", - "monolog/monolog": "~1.0", - "gregwar/image": "2.*", - "donatj/phpuseragentparser": "~0.3", - "pimple/pimple": "~3.2", - "rockettheme/toolbox": "~1.4", - "maximebf/debugbar": "~1.10", - "ext-mbstring": "*", - "ext-openssl": "*", - "ext-curl": "*", - "ext-zip": "*", - "league/climate": "^3.2", - "antoligy/dom-string-iterators": "^1.0", - "miljar/php-exif": "^0.6.3", - "composer/ca-bundle": "^1.0", - "dragonmantank/cron-expression": "^1.2", - "symfony/process": "^3.4" - }, - "require-dev": { - "codeception/codeception": "^2.1", - "phpunit/php-code-coverage": "~2.0", - "fzaninotto/faker": "^1.5", - "victorjonsson/markdowndocs": "dev-master" - }, - "config": { - "platform": { - "php": "5.6.4" - } - }, - "repositories": [ - { - "type": "vcs", - "url": "https://github.com/trilbymedia/PHP-Markdown-Documentation-Generator" - } - ], - "autoload": { - "psr-4": { - "Grav\\": "system/src/Grav" - }, - "files": ["system/defines.php"] - }, - "archive": { - "exclude": ["VERSION"] - }, - "scripts": { - "post-create-project-cmd": "bin/grav install", - "test": "vendor/bin/codecept run unit", - "test-windows": "vendor\\bin\\codecept run unit" - }, - "extra": { - "branch-alias": { - "dev-develop": "1.x-dev" - } - } -} diff --git a/composer_REMOTE_46658.json b/composer_REMOTE_46658.json deleted file mode 100644 index a211b6e82..000000000 --- a/composer_REMOTE_46658.json +++ /dev/null @@ -1,82 +0,0 @@ -{ - "name": "getgrav/grav", - "type": "project", - "description": "Modern, Crazy Fast, Ridiculously Easy and Amazingly Powerful Flat-File CMS", - "keywords": ["cms","flat-file cms","flat cms","flatfile cms","php"], - "homepage": "http://getgrav.org", - "license": "MIT", - "require": { - "php": ">=7.1.3", - "ext-json": "*", - "ext-mbstring": "*", - "ext-openssl": "*", - "ext-curl": "*", - "ext-zip": "*", - "symfony/polyfill-iconv": "^1.9", - "symfony/polyfill-php72": "^1.9", - "symfony/polyfill-php73": "^1.9", - - "psr/simple-cache": "^1.0", - "psr/http-message": "^1.0", - - "twig/twig": "~1.35", - "erusev/parsedown": "1.6.4", - "erusev/parsedown-extra": "~0.7", - "symfony/yaml": "~4.1", - "symfony/console": "~4.1", - "symfony/event-dispatcher": "~4.1", - "symfony/var-dumper": "~4.1", - "doctrine/cache": "^1.7", - "doctrine/collections": "^1.5", - "guzzlehttp/psr7": "^1.4", - "filp/whoops": "~2.2", - - "matthiasmullie/minify": "^1.3", - "monolog/monolog": "~1.0", - "gregwar/image": "2.*", - "donatj/phpuseragentparser": "~0.10", - "pimple/pimple": "~3.2", - "rockettheme/toolbox": "~1.4", - "maximebf/debugbar": "~1.15", - "league/climate": "^3.4", - "antoligy/dom-string-iterators": "^1.0", - "miljar/php-exif": "^0.6.4", - "composer/ca-bundle": "^1.0" - }, - "require-dev": { - "codeception/codeception": "^2.4", - "phpunit/php-code-coverage": "~6.0", - "fzaninotto/faker": "^1.8", - "victorjonsson/markdowndocs": "dev-master" - }, - "config": { - "platform": { - "php": "7.1.3" - } - }, - "repositories": [ - { - "type": "vcs", - "url": "https://github.com/trilbymedia/PHP-Markdown-Documentation-Generator" - } - ], - "autoload": { - "psr-4": { - "Grav\\": "system/src/Grav" - }, - "files": ["system/defines.php"] - }, - "archive": { - "exclude": ["VERSION"] - }, - "scripts": { - "post-create-project-cmd": "bin/grav install", - "test": "vendor/bin/codecept run unit", - "test-windows": "vendor\\bin\\codecept run unit" - }, - "extra": { - "branch-alias": { - "dev-develop": "1.x-dev" - } - } -}