ICDHandler initialization

thivya-amazon · Dec 12, 2023 · dd4298b · dd4298b
1 parent 2d72a55
commit dd4298b
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/src/app/icd/client/ICDHandler.h b/src/app/icd/client/ICDHandler.h
@@ -25,12 +25,9 @@
 
 #pragma once
 
-<<<<<<<< HEAD:src/app/icd/client/CheckInHandler.h
 #include <app/icd/client/CheckInDelegate.h>
+#include <app/icd/client/CheckInHandler.h>
 #include <app/icd/client/DefaultICDClientStorage.h>
-========
-#include <DefaultICDClientStorage.h>
->>>>>>>> 4201f08818 (ICDHandler initialization):src/app/icd/client/ICDHandler.h
 #include <lib/support/logging/CHIPLogging.h>
 #include <messaging/ExchangeContext.h>
 #include <messaging/ExchangeMgr.h>