| 
					
				 | 
			
			
				@@ -4,7 +4,7 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         "This file is @generated automatically" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     ], 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    "content-hash": "86a7160a178fde8504984c8b1bdd01a9", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    "content-hash": "b20308c661e56c9a2cfd1c9eb74fe3f1", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     "packages": [ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "name": "ajgl/breakpoint-twig-extension", 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -315,27 +315,28 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "name": "commerceguys/addressing", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            "version": "v1.2.2", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            "version": "v1.3.0", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "source": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "type": "git", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "url": "https://github.com/commerceguys/addressing.git", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                "reference": "fb98dfc72f8a3d12fac55f69ab2477a0fbfa9860" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                "reference": "566febd56ca71e31dd383b014c4e1bec680507bf" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "dist": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "type": "zip", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                "url": "https://api.github.com/repos/commerceguys/addressing/zipball/fb98dfc72f8a3d12fac55f69ab2477a0fbfa9860", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                "reference": "fb98dfc72f8a3d12fac55f69ab2477a0fbfa9860", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                "url": "https://api.github.com/repos/commerceguys/addressing/zipball/566febd56ca71e31dd383b014c4e1bec680507bf", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                "reference": "566febd56ca71e31dd383b014c4e1bec680507bf", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "shasum": "" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "require": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "doctrine/collections": "~1.0", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                "php": ">=7.1.3" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                "php": ">=7.3" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "require-dev": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                "ext-json": "*", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "mikey179/vfsstream": "1.*", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                "phpunit/phpunit": "^7.5", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                "phpunit/phpunit": "^9.5", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "squizlabs/php_codesniffer": "3.*", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                "symfony/validator": "^4.4" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                "symfony/validator": "^4.4 || ^5.4" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "suggest": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "symfony/validator": "to validate addresses" 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -372,9 +373,9 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             ], 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "support": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "issues": "https://github.com/commerceguys/addressing/issues", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                "source": "https://github.com/commerceguys/addressing/tree/v1.2.2" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                "source": "https://github.com/commerceguys/addressing/tree/v1.3.0" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            "time": "2021-10-30T12:33:41+00:00" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            "time": "2022-04-08T13:06:51+00:00" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "name": "components/highlightjs", 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -2660,17 +2661,17 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "name": "drupal/autocomplete_deluxe", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            "version": "2.0.1", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            "version": "2.0.2", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "source": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "type": "git", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "url": "https://git.drupalcode.org/project/autocomplete_deluxe.git", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                "reference": "2.0.1" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                "reference": "2.0.2" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "dist": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "type": "zip", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                "url": "https://ftp.drupal.org/files/projects/autocomplete_deluxe-2.0.1.zip", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                "reference": "2.0.1", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                "shasum": "244d3a1992da6ec126220bab22a933f9f6780d78" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                "url": "https://ftp.drupal.org/files/projects/autocomplete_deluxe-2.0.2.zip", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                "reference": "2.0.2", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                "shasum": "d8e3a57cb02b2448685736ccd4fa0d02c5aeb689" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "require": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "drupal/core": "^8 || ^9" 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -2678,8 +2679,8 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "type": "drupal-module", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "extra": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "drupal": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    "version": "2.0.1", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    "datestamp": "1630177423", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    "version": "2.0.2", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    "datestamp": "1649758219", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     "security-coverage": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         "status": "covered", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         "message": "Covered by Drupal's security advisory policy" 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -3147,6 +3148,7 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "name": "drupal/config_filter", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+<<<<<<< HEAD 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "version": "1.9.0", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "source": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "type": "git", 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -3158,6 +3160,19 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "url": "https://ftp.drupal.org/files/projects/config_filter-8.x-1.9.zip", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "reference": "8.x-1.9", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "shasum": "cf6919fc5039771f8e6c2ed203f29ab0eca8d91f" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+======= 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            "version": "2.3.0", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            "source": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                "type": "git", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                "url": "https://git.drupalcode.org/project/config_filter.git", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                "reference": "8.x-2.3" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            "dist": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                "type": "zip", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                "url": "https://ftp.drupal.org/files/projects/config_filter-8.x-2.3.zip", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                "reference": "8.x-2.3", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                "shasum": "043fc712997cdd6b384024ab96bebba70e5c6b26" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+>>>>>>> fa8d7c43473773cd259f19ae4a05136f767aa50d 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "require": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "drupal/core": "^8 || ^9" 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -3168,8 +3183,13 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "type": "drupal-module", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "extra": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "drupal": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+<<<<<<< HEAD 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     "version": "8.x-1.9", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     "datestamp": "1649336052", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+======= 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    "version": "8.x-2.3", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    "datestamp": "1649336106", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+>>>>>>> fa8d7c43473773cd259f19ae4a05136f767aa50d 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     "security-coverage": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         "status": "covered", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         "message": "Covered by Drupal's security advisory policy" 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -3779,6 +3799,7 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "name": "drupal/core", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+<<<<<<< HEAD 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "version": "9.3.9", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "source": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "type": "git", 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -3789,6 +3810,18 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "type": "zip", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "url": "https://api.github.com/repos/drupal/core/zipball/86b0c4496e20ae7f945e9a7f0404fafe191ab774", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "reference": "86b0c4496e20ae7f945e9a7f0404fafe191ab774", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+======= 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            "version": "9.3.12", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            "source": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                "type": "git", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                "url": "https://github.com/drupal/core.git", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                "reference": "ed6af33093f66a9c5048d02f9f2c326ad0e7e90c" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            "dist": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                "type": "zip", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                "url": "https://api.github.com/repos/drupal/core/zipball/ed6af33093f66a9c5048d02f9f2c326ad0e7e90c", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                "reference": "ed6af33093f66a9c5048d02f9f2c326ad0e7e90c", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+>>>>>>> fa8d7c43473773cd259f19ae4a05136f767aa50d 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "shasum": "" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "require": { 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -4030,6 +4063,7 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             ], 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "description": "Drupal is an open source content management platform powering millions of websites and applications.", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "support": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+<<<<<<< HEAD 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "source": "https://github.com/drupal/core/tree/9.3.9" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "time": "2022-03-21T21:21:58+00:00" 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -4037,6 +4071,15 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "name": "drupal/core-composer-scaffold", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "version": "9.3.9", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+======= 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                "source": "https://github.com/drupal/core/tree/9.3.12" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            "time": "2022-04-20T14:25:27+00:00" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            "name": "drupal/core-composer-scaffold", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            "version": "9.3.12", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+>>>>>>> fa8d7c43473773cd259f19ae4a05136f767aa50d 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "source": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "type": "git", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "url": "https://github.com/drupal/core-composer-scaffold.git", 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -4080,13 +4123,21 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "drupal" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             ], 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "support": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+<<<<<<< HEAD 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "source": "https://github.com/drupal/core-composer-scaffold/tree/9.3.9" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+======= 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                "source": "https://github.com/drupal/core-composer-scaffold/tree/9.3.12" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+>>>>>>> fa8d7c43473773cd259f19ae4a05136f767aa50d 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "time": "2022-02-24T17:40:56+00:00" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "name": "drupal/core-project-message", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+<<<<<<< HEAD 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "version": "9.3.9", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+======= 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            "version": "9.3.12", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+>>>>>>> fa8d7c43473773cd259f19ae4a05136f767aa50d 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "source": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "type": "git", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "url": "https://github.com/drupal/core-project-message.git", 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -4121,12 +4172,17 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "drupal" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             ], 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "support": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+<<<<<<< HEAD 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "source": "https://github.com/drupal/core-project-message/tree/9.3.9" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+======= 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                "source": "https://github.com/drupal/core-project-message/tree/9.3.12" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+>>>>>>> fa8d7c43473773cd259f19ae4a05136f767aa50d 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "time": "2022-02-24T17:40:56+00:00" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "name": "drupal/core-recommended", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+<<<<<<< HEAD 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "version": "9.3.9", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "source": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "type": "git", 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -4137,6 +4193,18 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "type": "zip", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "url": "https://api.github.com/repos/drupal/core-recommended/zipball/3ce3f2b6145de56178e006fb2ef94089d32cf411", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "reference": "3ce3f2b6145de56178e006fb2ef94089d32cf411", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+======= 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            "version": "9.3.12", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            "source": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                "type": "git", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                "url": "https://github.com/drupal/core-recommended.git", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                "reference": "a8fa50016c1aa1eb7f4e54f590e6343d286c418f" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            "dist": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                "type": "zip", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                "url": "https://api.github.com/repos/drupal/core-recommended/zipball/a8fa50016c1aa1eb7f4e54f590e6343d286c418f", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                "reference": "a8fa50016c1aa1eb7f4e54f590e6343d286c418f", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+>>>>>>> fa8d7c43473773cd259f19ae4a05136f767aa50d 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "shasum": "" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "require": { 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -4145,7 +4213,11 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "doctrine/annotations": "1.13.2", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "doctrine/lexer": "1.2.1", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "doctrine/reflection": "1.2.2", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+<<<<<<< HEAD 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "drupal/core": "9.3.9", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+======= 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                "drupal/core": "9.3.12", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+>>>>>>> fa8d7c43473773cd259f19ae4a05136f767aa50d 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "egulias/email-validator": "3.1.2", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "guzzlehttp/guzzle": "6.5.5", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "guzzlehttp/promises": "1.5.1", 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -4207,9 +4279,15 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             ], 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "description": "Locked core dependencies; require this project INSTEAD OF drupal/core.", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "support": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+<<<<<<< HEAD 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "source": "https://github.com/drupal/core-recommended/tree/9.3.9" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "time": "2022-03-21T21:21:58+00:00" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+======= 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                "source": "https://github.com/drupal/core-recommended/tree/9.3.12" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            "time": "2022-04-20T14:25:27+00:00" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+>>>>>>> fa8d7c43473773cd259f19ae4a05136f767aa50d 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "name": "drupal/cshs", 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -5328,8 +5406,13 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "type": "drupal-module", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "extra": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "drupal": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+<<<<<<< HEAD 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     "version": "8.x-3.2", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     "datestamp": "1628513585", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+======= 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    "version": "8.x-3.2+7-dev", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    "datestamp": "1635152929", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+>>>>>>> fa8d7c43473773cd259f19ae4a05136f767aa50d 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     "security-coverage": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         "status": "covered", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         "message": "Covered by Drupal's security advisory policy" 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -5536,17 +5619,17 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "name": "drupal/geocoder", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            "version": "3.25.0", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            "version": "3.26.0", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "source": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "type": "git", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "url": "https://git.drupalcode.org/project/geocoder.git", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                "reference": "8.x-3.25" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                "reference": "8.x-3.26" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "dist": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "type": "zip", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                "url": "https://ftp.drupal.org/files/projects/geocoder-8.x-3.25.zip", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                "reference": "8.x-3.25", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                "shasum": "959dd2df6c17eaa0550ecb3943f06bb77d1d3adc" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                "url": "https://ftp.drupal.org/files/projects/geocoder-8.x-3.26.zip", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                "reference": "8.x-3.26", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                "shasum": "77aadfd0b8ec8601b681e70866545a7b3899756f" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "require": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "davedevelopment/stiphle": "^0.9.2", 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -5561,6 +5644,7 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "drupal/coder": "^8.2", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "drupal/geocoder_field": "*", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "drupal/geofield": "*", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                "geo6/geocoder-php-addok-provider": "^1.0", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "geo6/geocoder-php-bpost-provider": "^1.3.0", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "geo6/geocoder-php-geopunt-provider": "^1.0", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "geo6/geocoder-php-spw-provider": "^1.0", 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -5592,8 +5676,8 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "type": "drupal-module", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "extra": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "drupal": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    "version": "8.x-3.25", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    "datestamp": "1642803151", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    "version": "8.x-3.26", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    "datestamp": "1649610015", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     "security-coverage": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         "status": "covered", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         "message": "Covered by Drupal's security advisory policy" 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -5662,17 +5746,17 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "name": "drupal/geofield", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            "version": "1.38.0", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            "version": "1.39.0", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "source": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "type": "git", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "url": "https://git.drupalcode.org/project/geofield.git", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                "reference": "8.x-1.38" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                "reference": "8.x-1.39" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "dist": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "type": "zip", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                "url": "https://ftp.drupal.org/files/projects/geofield-8.x-1.38.zip", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                "reference": "8.x-1.38", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                "shasum": "a41ce66e4aab2c266a8e9f0addcac68a0b76f44b" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                "url": "https://ftp.drupal.org/files/projects/geofield-8.x-1.39.zip", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                "reference": "8.x-1.39", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                "shasum": "7afd4bb32c21e7bf84568ecc0c1403a3541c2837" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "require": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "drupal/core": "^8.8 || ^9", 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -5681,8 +5765,9 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "type": "drupal-module", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "extra": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "drupal": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    "version": "8.x-1.38", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    "datestamp": "1646604411", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    "version": "8.x-1.39", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    "datestamp": "1649534200", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     "security-coverage": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         "status": "covered", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         "message": "Covered by Drupal's security advisory policy" 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -7131,6 +7216,7 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "name": "drupal/matomo", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+<<<<<<< HEAD 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "version": "1.17.0", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "source": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "type": "git", 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -7142,6 +7228,19 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "url": "https://ftp.drupal.org/files/projects/matomo-8.x-1.17.zip", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "reference": "8.x-1.17", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "shasum": "091f946ec7a09d6b4463e5d75adca9cdcdff2918" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+======= 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            "version": "1.18.0", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            "source": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                "type": "git", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                "url": "https://git.drupalcode.org/project/matomo.git", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                "reference": "8.x-1.18" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            "dist": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                "type": "zip", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                "url": "https://ftp.drupal.org/files/projects/matomo-8.x-1.18.zip", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                "reference": "8.x-1.18", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                "shasum": "ad0d24ba12bca16e666a5f9d404cd56926839169" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+>>>>>>> fa8d7c43473773cd259f19ae4a05136f767aa50d 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "require": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "drupal/core": "^8.8.0 || ^9.0.0" 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -7157,8 +7256,13 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "type": "drupal-module", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "extra": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "drupal": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+<<<<<<< HEAD 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     "version": "8.x-1.17", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     "datestamp": "1647206848", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+======= 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    "version": "8.x-1.18", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    "datestamp": "1649792938", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+>>>>>>> fa8d7c43473773cd259f19ae4a05136f767aa50d 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     "security-coverage": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         "status": "covered", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         "message": "Covered by Drupal's security advisory policy" 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -7432,201 +7536,6 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "issues": "https://www.drupal.org/project/issues/menu_position" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            "name": "drupal/migrate_devel", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            "version": "dev-2.x", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            "source": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                "type": "git", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                "url": "https://git.drupalcode.org/project/migrate_devel.git", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                "reference": "c60d049d91389bde0cc5368fabfda24c5eb61780" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            "require": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                "drupal/core": "^8 || ^9" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            "conflict": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                "drush/drush": "<9" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            "type": "drupal-module", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            "extra": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                "branch-alias": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    "dev-2.x": "2.x-dev" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                "drupal": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    "version": "8.x-2.0-alpha1+3-dev", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    "datestamp": "1592898665", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    "security-coverage": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                        "status": "not-covered", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                        "message": "Dev releases are not covered by Drupal security advisories." 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                "drush": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    "services": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                        "drush.services.yml": "^9" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            "notification-url": "https://packages.drupal.org/8/downloads", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            "license": [ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                "GPL-2.0-or-later" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            ], 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            "authors": [ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    "name": "Derimagia", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    "homepage": "https://www.drupal.org/user/819640" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    "name": "aczietlow", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    "homepage": "https://www.drupal.org/user/1616656" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    "name": "andrewmacpherson", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    "homepage": "https://www.drupal.org/user/265648" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            ], 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            "description": "Migrate Development Tools", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            "homepage": "https://www.drupal.org/project/migrate_devel", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            "support": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                "source": "https://git.drupalcode.org/project/migrate_devel", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                "issues": "https://www.drupal.org/project/issues/migrate_devel" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            "name": "drupal/migrate_plus", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            "version": "5.2.0", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            "source": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                "type": "git", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                "url": "https://git.drupalcode.org/project/migrate_plus.git", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                "reference": "8.x-5.2" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            "dist": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                "type": "zip", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                "url": "https://ftp.drupal.org/files/projects/migrate_plus-8.x-5.2.zip", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                "reference": "8.x-5.2", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                "shasum": "03ae34c362ccfacc4ae95b58469b25522e0ffb68" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            "require": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                "drupal/core": "^9.1" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            "require-dev": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                "drupal/migrate_example_advanced_setup": "*", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                "drupal/migrate_example_setup": "*", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                "drush/drush": "^10" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            "suggest": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                "ext-soap": "*", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                "sainsburys/guzzle-oauth2-plugin": "3.0 required for the OAuth2 authentication plugin" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            "type": "drupal-module", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            "extra": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                "drupal": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    "version": "8.x-5.2", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    "datestamp": "1641478565", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    "security-coverage": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                        "status": "covered", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                        "message": "Covered by Drupal's security advisory policy" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                "drush": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    "services": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                        "drush.services.yml": "^9 || ^10" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            "notification-url": "https://packages.drupal.org/8/downloads", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            "license": [ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                "GPL-2.0-or-later" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            ], 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            "authors": [ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    "name": "Mike Ryan", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    "homepage": "https://www.drupal.org/u/mikeryan", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    "role": "Maintainer" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    "name": "Lucas Hedding", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    "homepage": "https://www.drupal.org/u/heddn", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    "role": "Maintainer" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    "name": "mikeryan", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    "homepage": "https://www.drupal.org/user/4420" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            ], 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            "description": "Enhancements to core migration support.", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            "homepage": "https://www.drupal.org/project/migrate_plus", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            "support": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                "source": "https://git.drupalcode.org/project/migrate_plus", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                "issues": "https://www.drupal.org/project/issues/migrate_plus", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                "slack": "#migrate" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            "name": "drupal/migrate_tools", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            "version": "dev-5.x", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            "source": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                "type": "git", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                "url": "https://git.drupalcode.org/project/migrate_tools.git", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                "reference": "310ddce63f0d7e0b08b0f1979db0c55012ce0fb7" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            "require": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                "drupal/core": "^9.1", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                "drupal/migrate_plus": "^5", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                "php": ">=7.1" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            "require-dev": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                "drupal/migrate_source_csv": "^3.0", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                "drush/drush": "^10" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            "suggest": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                "drush/drush": "^9 || ^10" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            "type": "drupal-module", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            "extra": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                "branch-alias": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    "dev-5.x": "5.x-dev" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                "drupal": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    "version": "8.x-5.1+2-dev", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    "datestamp": "1644356540", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    "security-coverage": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                        "status": "not-covered", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                        "message": "Dev releases are not covered by Drupal security advisories." 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                "drush": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    "services": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                        "drush.services.yml": "^9 || ^10" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            "notification-url": "https://packages.drupal.org/8/downloads", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            "license": [ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                "GPL-2.0-or-later" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            ], 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            "authors": [ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    "name": "Mike Ryan", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    "homepage": "https://www.drupal.org/u/mikeryan", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    "role": "Maintainer" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    "name": "Lucas Hedding", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    "homepage": "https://www.drupal.org/u/heddn", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    "role": "Maintainer" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    "name": "mikeryan", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    "homepage": "https://www.drupal.org/user/4420" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            ], 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            "description": "Tools to assist in developing and running migrations.", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            "homepage": "http://drupal.org/project/migrate_tools", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            "support": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                "source": "https://git.drupalcode.org/project/migrate_tools", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                "issues": "https://www.drupal.org/project/issues/migrate_tools", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                "slack": "#migrate" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "name": "drupal/page_manager", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "version": "dev-4.x", 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -7646,8 +7555,8 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     "dev-8.x-4.x": "4.x-dev" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "drupal": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    "version": "8.x-4.0-beta6+1-dev", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    "datestamp": "1613459893", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    "version": "8.x-4.0-beta6+2-dev", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    "datestamp": "1631999122", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     "security-coverage": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         "status": "not-covered", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         "message": "Project has not opted into security advisory coverage!" 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -7988,7 +7897,11 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "source": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "type": "git", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "url": "https://git.drupalcode.org/project/paragraphs.git", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+<<<<<<< HEAD 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "reference": "80e4c5bfbfbf27d4cb59a228c0011ce81496ba76" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+======= 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                "reference": "6a75a6148bc31ffc5662c9a8130d32ec16aaaf6f" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+>>>>>>> fa8d7c43473773cd259f19ae4a05136f767aa50d 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "require": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "drupal/core": "^9.2", 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -8016,8 +7929,13 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     "dev-1.x": "1.x-dev" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "drupal": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+<<<<<<< HEAD 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     "version": "8.x-1.13+5-dev", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     "datestamp": "1646129836", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+======= 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    "version": "8.x-1.13+11-dev", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    "datestamp": "1650520402", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+>>>>>>> fa8d7c43473773cd259f19ae4a05136f767aa50d 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     "security-coverage": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         "status": "not-covered", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         "message": "Dev releases are not covered by Drupal security advisories." 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -8111,17 +8029,17 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "name": "drupal/pathauto", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            "version": "1.9.0", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            "version": "1.10.0", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "source": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "type": "git", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "url": "https://git.drupalcode.org/project/pathauto.git", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                "reference": "8.x-1.9" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                "reference": "8.x-1.10" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "dist": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "type": "zip", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                "url": "https://ftp.drupal.org/files/projects/pathauto-8.x-1.9.zip", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                "reference": "8.x-1.9", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                "shasum": "f075ebff595c9b8b62333d65ad29020330e0ea9d" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                "url": "https://ftp.drupal.org/files/projects/pathauto-8.x-1.10.zip", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                "reference": "8.x-1.10", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                "shasum": "f49d5fbcd7a2c1b4de1da07194fe01d9012237ec" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "require": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "drupal/core": "^8.8 || ^9", 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -8134,8 +8052,8 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "type": "drupal-module", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "extra": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "drupal": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    "version": "8.x-1.9", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    "datestamp": "1644822949", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    "version": "8.x-1.10", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    "datestamp": "1650806739", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     "security-coverage": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         "status": "covered", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         "message": "Covered by Drupal's security advisory policy" 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -9555,6 +9473,7 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "name": "drupal/views_bulk_operations", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+<<<<<<< HEAD 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "version": "3.13.0", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "source": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "type": "git", 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -9566,9 +9485,22 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "url": "https://ftp.drupal.org/files/projects/views_bulk_operations-8.x-3.13.zip", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "reference": "8.x-3.13", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "shasum": "70583d08b91be3b5e008f571589425c2176eb73b" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+======= 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            "version": "4.1.2", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            "source": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                "type": "git", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                "url": "https://git.drupalcode.org/project/views_bulk_operations.git", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                "reference": "4.1.2" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            "dist": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                "type": "zip", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                "url": "https://ftp.drupal.org/files/projects/views_bulk_operations-4.1.2.zip", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                "reference": "4.1.2", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                "shasum": "1cfa10f755240cae46de8d8684272a9a8907a730" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+>>>>>>> fa8d7c43473773cd259f19ae4a05136f767aa50d 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "require": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                "drupal/core": "^8.8 || ^9" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                "drupal/core": "^9" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "require-dev": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "drush/drush": "^10" 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -9579,8 +9511,13 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "type": "drupal-module", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "extra": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "drupal": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+<<<<<<< HEAD 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     "version": "8.x-3.13", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     "datestamp": "1619697066", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+======= 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    "version": "4.1.2", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    "datestamp": "1647943086", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+>>>>>>> fa8d7c43473773cd259f19ae4a05136f767aa50d 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     "security-coverage": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         "status": "covered", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         "message": "Covered by Drupal's security advisory policy" 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -12373,6 +12310,7 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "name": "psy/psysh", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+<<<<<<< HEAD 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "version": "v0.10.12", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "source": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "type": "git", 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -12383,6 +12321,18 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "type": "zip", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "url": "https://api.github.com/repos/bobthecow/psysh/zipball/a0d9981aa07ecfcbea28e4bfa868031cca121e7d", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "reference": "a0d9981aa07ecfcbea28e4bfa868031cca121e7d", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+======= 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            "version": "v0.11.2", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            "source": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                "type": "git", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                "url": "https://github.com/bobthecow/psysh.git", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                "reference": "7f7da640d68b9c9fec819caae7c744a213df6514" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            "dist": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                "type": "zip", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                "url": "https://api.github.com/repos/bobthecow/psysh/zipball/7f7da640d68b9c9fec819caae7c744a213df6514", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                "reference": "7f7da640d68b9c9fec819caae7c744a213df6514", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+>>>>>>> fa8d7c43473773cd259f19ae4a05136f767aa50d 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "shasum": "" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "require": { 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -12393,6 +12343,9 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "symfony/console": "~5.0|~4.0|~3.0|^2.4.2|~2.3.10", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "symfony/var-dumper": "~5.0|~4.0|~3.0|~2.7" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            "conflict": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                "symfony/console": "4.4.37 || 5.3.14 || 5.3.15 || 5.4.3 || 5.4.4 || 6.0.3 || 6.0.4" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "require-dev": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "bamarni/composer-bin-plugin": "^1.2", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "hoa/console": "3.17.*" 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -12442,9 +12395,15 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             ], 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "support": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "issues": "https://github.com/bobthecow/psysh/issues", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+<<<<<<< HEAD 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "source": "https://github.com/bobthecow/psysh/tree/v0.10.12" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "time": "2021-11-30T14:05:36+00:00" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+======= 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                "source": "https://github.com/bobthecow/psysh/tree/v0.11.2" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            "time": "2022-02-28T15:28:54+00:00" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+>>>>>>> fa8d7c43473773cd259f19ae4a05136f767aa50d 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "name": "ralouphie/getallheaders", 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -15919,8 +15878,6 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         "drupal/address": 20, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         "drupal/administerusersbyrole": 20, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         "drupal/better_exposed_filters": 10, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        "drupal/migrate_devel": 20, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        "drupal/migrate_tools": 20, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         "drupal/page_manager": 20, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         "drupal/paragraphs": 20, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         "drupal/perimeter": 20, 
			 |