fixed bad commit of composer.lock

This commit is contained in:
Bachir Soussi Chiadmi 2019-05-16 22:38:23 +02:00
parent 6e41826ffa
commit 96ce825c8a
1 changed files with 0 additions and 43 deletions

43
composer.lock generated
View File

@ -4,11 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
<<<<<<< HEAD
"content-hash": "0895449786929d208f00cb47b40dbb9c",
=======
"content-hash": "9637de17e77a13de751d76ebb87d8f35", "content-hash": "9637de17e77a13de751d76ebb87d8f35",
>>>>>>> master
"packages": [ "packages": [
{ {
"name": "alchemy/zippy", "name": "alchemy/zippy",
@ -4647,18 +4643,6 @@
}, },
{ {
"name": "drupal/core", "name": "drupal/core",
<<<<<<< HEAD
"version": "8.6.16",
"source": {
"type": "git",
"url": "https://github.com/drupal/core.git",
"reference": "a9c4c97c7da9ec1a38782912bb06784d28590539"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/drupal/core/zipball/a9c4c97c7da9ec1a38782912bb06784d28590539",
"reference": "a9c4c97c7da9ec1a38782912bb06784d28590539",
=======
"version": "8.7.1", "version": "8.7.1",
"source": { "source": {
"type": "git", "type": "git",
@ -4669,7 +4653,6 @@
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/drupal/core/zipball/969f24810fb31eac71dd624de593f551bd6dc2a3", "url": "https://api.github.com/repos/drupal/core/zipball/969f24810fb31eac71dd624de593f551bd6dc2a3",
"reference": "969f24810fb31eac71dd624de593f551bd6dc2a3", "reference": "969f24810fb31eac71dd624de593f551bd6dc2a3",
>>>>>>> master
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -4904,11 +4887,7 @@
"GPL-2.0-or-later" "GPL-2.0-or-later"
], ],
"description": "Drupal is an open source content management platform powering millions of websites and applications.", "description": "Drupal is an open source content management platform powering millions of websites and applications.",
<<<<<<< HEAD
"time": "2019-05-08T16:00:58+00:00"
=======
"time": "2019-05-08T16:00:55+00:00" "time": "2019-05-08T16:00:55+00:00"
>>>>>>> master
}, },
{ {
"name": "drupal/cshs", "name": "drupal/cshs",
@ -16118,18 +16097,6 @@
}, },
{ {
"name": "webflo/drupal-core-require-dev", "name": "webflo/drupal-core-require-dev",
<<<<<<< HEAD
"version": "8.6.16",
"source": {
"type": "git",
"url": "https://github.com/webflo/drupal-core-require-dev.git",
"reference": "e40bed8b3de2b75e10874e2754f51559615d8e59"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/webflo/drupal-core-require-dev/zipball/e40bed8b3de2b75e10874e2754f51559615d8e59",
"reference": "e40bed8b3de2b75e10874e2754f51559615d8e59",
=======
"version": "8.7.1", "version": "8.7.1",
"source": { "source": {
"type": "git", "type": "git",
@ -16140,20 +16107,14 @@
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/webflo/drupal-core-require-dev/zipball/91acb9e4723e371290b11eff67fbb5884d3c8e6c", "url": "https://api.github.com/repos/webflo/drupal-core-require-dev/zipball/91acb9e4723e371290b11eff67fbb5884d3c8e6c",
"reference": "91acb9e4723e371290b11eff67fbb5884d3c8e6c", "reference": "91acb9e4723e371290b11eff67fbb5884d3c8e6c",
>>>>>>> master
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"behat/mink": "1.7.x-dev", "behat/mink": "1.7.x-dev",
"behat/mink-goutte-driver": "^1.2", "behat/mink-goutte-driver": "^1.2",
"behat/mink-selenium2-driver": "1.3.x-dev", "behat/mink-selenium2-driver": "1.3.x-dev",
<<<<<<< HEAD
"drupal/coder": "^8.2.12",
"drupal/core": "8.6.16",
=======
"drupal/coder": "^8.3.1", "drupal/coder": "^8.3.1",
"drupal/core": "8.7.1", "drupal/core": "8.7.1",
>>>>>>> master
"jcalderonzumba/gastonjs": "^1.0.2", "jcalderonzumba/gastonjs": "^1.0.2",
"jcalderonzumba/mink-phantomjs-driver": "^0.3.1", "jcalderonzumba/mink-phantomjs-driver": "^0.3.1",
"justinrainbow/json-schema": "^5.2", "justinrainbow/json-schema": "^5.2",
@ -16170,11 +16131,7 @@
"GPL-2.0-or-later" "GPL-2.0-or-later"
], ],
"description": "require-dev dependencies from drupal/core", "description": "require-dev dependencies from drupal/core",
<<<<<<< HEAD
"time": "2019-05-08T17:31:42+00:00"
=======
"time": "2019-05-08T17:31:44+00:00" "time": "2019-05-08T17:31:44+00:00"
>>>>>>> master
} }
], ],
"aliases": [], "aliases": [],