From 95c67ea155b2cda7d2e9152c7e51b3d3e136abb7 Mon Sep 17 00:00:00 2001
From: Jake Barnby <jakeb994@gmail.com>
Date: Mon, 23 Feb 2026 22:17:55 +1300
Subject: [PATCH] fix: resolve merge conflict markers in composer.lock

The merge of 1.8.x into feat-mongodb left unresolved conflict markers
in composer.lock, breaking all CI checks. Resolved in favor of
feat-mongodb values (minimum-stability: dev, prefer-stable: true)
to match composer.json.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 composer.lock | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/composer.lock b/composer.lock
index 20136e89da..2226627342 100644
--- a/composer.lock
+++ b/composer.lock
@@ -8989,15 +8989,9 @@
         }
     ],
     "aliases": [],
-<<<<<<< feat-mongodb
     "minimum-stability": "dev",
     "stability-flags": {},
     "prefer-stable": true,
-=======
-    "minimum-stability": "stable",
-    "stability-flags": {},
-    "prefer-stable": false,
->>>>>>> 1.8.x
     "prefer-lowest": false,
     "platform": {
         "php": ">=8.3.0",