Issue #3238373: fix merge conflict. (759ec06e) · Commits · project / drupal

composer.lock

+0 −8

Original line number	Diff line number	Diff line
		@@ -784,11 +784,7 @@
		},
		{
		"name": "drupal/core-project-message",
		<<<<<<< HEAD
		"version": "9.2.x-dev",
		=======
		"version": "9.2.6",
		>>>>>>> 9.2.6
		"dist": {
		"type": "path",
		"url": "composer/Plugin/ProjectMessage",
		@@ -821,11 +817,7 @@
		},
		{
		"name": "drupal/core-vendor-hardening",
		<<<<<<< HEAD
		"version": "9.2.x-dev",
		=======
		"version": "9.2.6",
		>>>>>>> 9.2.6
		"dist": {
		"type": "path",
		"url": "composer/Plugin/VendorHardening",