Updated comment

project-chip · Jun 8, 2022 · f18945d · f18945d
1 parent 2101c12
commit f18945d
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/src/controller/AutoCommissioner.cpp b/src/controller/AutoCommissioner.cpp
@@ -295,7 +295,6 @@ CHIP_ERROR AutoCommissioner::StartCommissioning(DeviceCommissioner * commissione
 
 Optional<System::Clock::Timeout> AutoCommissioner::GetCommandTimeout(DeviceProxy * device, CommissioningStage stage) const
 {
-<<<<<<< HEAD
     // Network clusters can indicate the time required to connect, so if we are
     // connecting, use that time as our "how long it takes to process server
     // side" time.  Otherwise pick a time that should be enough for the command