Merge branch 'main' into service-instance-id

open-telemetry · May 22, 2024 · c416219 · c416219
2 parents 7729036 + 39f81a3
commit c416219
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md
@@ -1,5 +1,5 @@
 ## [Development](DEVELOPMENT.md)
-For repeatability and consistency across different operating systems, we use the [3 Musketeers pattern](https://3musketeers.io/). If you're on Windows, it might be a good idea to use Git bash for following the steps below.
+For repeatability and consistency across different operating systems, we use the [3 Musketeers pattern](https://3musketeers.pages.dev/). If you're on Windows, it might be a good idea to use Git bash for following the steps below.
 
 **Note: After cloning the repository, copy `.env.dist` to `.env`.** 
 

diff --git a/composer.json b/composer.json
@@ -105,6 +105,9 @@
         "symfony/var-exporter": "^5.4 || ^6.4 || ^7.0",
         "symfony/yaml": "^5.4 || ^6.4 || ^7.0"
     },
+    "conflict": {
+        "mockery/mockery": "1.6.12"
+    },
     "suggest": {
         "ext-gmp": "To support unlimited number of synchronous metric readers",
         "ext-grpc": "To use the OTLP GRPC Exporter",