From 3c0fca89a7fc1220778674947cabac45bee9989d Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@apple.com>
Date: Mon, 6 Dec 2021 13:09:02 -0500
Subject: [PATCH] Fix two CHIP_ERROR values overlapping.

CHIP_ERROR_ANOTHER_COMMISSIONING_IN_PROGRESS and
CHIP_ERROR_IM_MALFORMED_COMMAND_STATUS_IB have the same value,
probably due to undetected merge conflict.
---
 src/lib/core/CHIPError.h | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/lib/core/CHIPError.h b/src/lib/core/CHIPError.h
index 45f8f710915b3a..d26b5a10170847 100644
--- a/src/lib/core/CHIPError.h
+++ b/src/lib/core/CHIPError.h
@@ -2207,15 +2207,6 @@ using CHIP_ERROR = ::chip::ChipError;
  */
 #define CHIP_ERROR_IM_STATUS_CODE_RECEIVED                     CHIP_CORE_ERROR(0xca)
 
-/*
- * @def CHIP_ERROR_ANOTHER_COMMISSIONING_IN_PROGRESS
- *
- * @brief
- *   Indicates that the commissioning window on the device is already open, and another
- *   commissioning is in progress
- */
-#define CHIP_ERROR_ANOTHER_COMMISSIONING_IN_PROGRESS           CHIP_CORE_ERROR(0xcb)
-
 /**
  * @def CHIP_ERROR_IM_MALFORMED_COMMAND_STATUS_IB
  *
@@ -2315,6 +2306,15 @@ using CHIP_ERROR = ::chip::ChipError;
  */
 #define CHIP_ERROR_IM_MALFORMED_EVENT_REPORT_IB             CHIP_CORE_ERROR(0xd5)
 
+/*
+ * @def CHIP_ERROR_ANOTHER_COMMISSIONING_IN_PROGRESS
+ *
+ * @brief
+ *   Indicates that the commissioning window on the device is already open, and another
+ *   commissioning is in progress
+ */
+#define CHIP_ERROR_ANOTHER_COMMISSIONING_IN_PROGRESS           CHIP_CORE_ERROR(0xd6)
+
 /**
  *  @}
  */