Commit 6b640b6b authored by catch's avatar catch
Browse files

Issue #3238373: fix merge conflict.

parent 42286064
...@@ -897,11 +897,7 @@ ...@@ -897,11 +897,7 @@
}, },
{ {
"name": "drupal/core-project-message", "name": "drupal/core-project-message",
<<<<<<< HEAD
"version": "8.9.x-dev", "version": "8.9.x-dev",
=======
"version": "8.9.19",
>>>>>>> 8.9.19
"dist": { "dist": {
"type": "path", "type": "path",
"url": "composer/Plugin/ProjectMessage", "url": "composer/Plugin/ProjectMessage",
...@@ -934,11 +930,7 @@ ...@@ -934,11 +930,7 @@
}, },
{ {
"name": "drupal/core-vendor-hardening", "name": "drupal/core-vendor-hardening",
<<<<<<< HEAD
"version": "8.9.x-dev", "version": "8.9.x-dev",
=======
"version": "8.9.19",
>>>>>>> 8.9.19
"dist": { "dist": {
"type": "path", "type": "path",
"url": "composer/Plugin/VendorHardening", "url": "composer/Plugin/VendorHardening",
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment