From a4a4d8ceb82bcb2ef341f0e79e994314a6cc5217 Mon Sep 17 00:00:00 2001
From: Eduardo Montoya <edmont@users.noreply.github.com>
Date: Fri, 27 Aug 2021 17:27:44 +0200
Subject: [PATCH] [docs] remove stale comment (#6964)

---
 src/cli/cli_config.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/cli/cli_config.h b/src/cli/cli_config.h
index edebf7feb..96148e3db 100644
--- a/src/cli/cli_config.h
+++ b/src/cli/cli_config.h
@@ -59,7 +59,6 @@
 #endif
 
 /**
-<<<<<<< HEAD
  * @def OPENTHREAD_CONFIG_CLI_TCP_ENABLE
  *
  * Indicates whether TCP should be enabled in the CLI tool.