From bc617c4ed11836336926a70164fb8cb1e79bd5c4 Mon Sep 17 00:00:00 2001
From: Nordic Builder <pylon@nordicsemi.no>
Date: Wed, 23 Oct 2024 08:33:58 +0000
Subject: [PATCH] manifest: Update sdk-connectedhomeip revision (auto-manifest
 PR)

Automatically created by Github Action

Signed-off-by: Nordic Builder <pylon@nordicsemi.no>
---
 west.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/west.yml b/west.yml
index 9b5ec90fd150..56a2a63258d2 100644
--- a/west.yml
+++ b/west.yml
@@ -158,7 +158,11 @@ manifest:
     - name: matter
       repo-path: sdk-connectedhomeip
       path: modules/lib/matter
+<<<<<<< HEAD
       revision: 93c712e6e0be9211507cb9e559860b32daa984ed
+=======
+      revision: pull/499/head
+>>>>>>> 9f524815dc9 (manifest: Update sdk-connectedhomeip revision (auto-manifest PR))
       west-commands: scripts/west/west-commands.yml
       submodules:
         - name: nlio