Merge branch 'main' of github.com:magento-commerce/facebook-for-magento2 into 1.0.0-release

omiroshnichenko · omiroshnichenko · commit ffa700142f96 · 2023-03-06T19:57:11.000-06:00
diff --git a/app/code/Meta/_metapackage/composer.json b/app/code/Meta/_metapackage/composer.json
@@ -8,5 +8,8 @@
         "meta/module-conversion": "*",
         "meta/module-promotions": "*",
         "meta/module-sales": "*"
+    },
+    "conflict": {
+        "facebook/facebook-for-magento2": "*"
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -8,5 +8,8 @@`
`8`	`8`	`"meta/module-conversion": "*",`
`9`	`9`	`"meta/module-promotions": "*",`
`10`	`10`	`"meta/module-sales": "*"`
	`11`	`+ },`
	`12`	`+ "conflict": {`
	`13`	`+ "facebook/facebook-for-magento2": "*"`
`11`	`14`	`}`
`12`	`15`	`}`