Resolved conflicts

project-chip · Dec 15, 2021 · 5841ec3 · 5841ec3
1 parent 5e91ccb
commit 5841ec3
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 8,527 deletions.
diff --git a/.github/.wordlist.txt b/.github/.wordlist.txt
@@ -150,6 +150,7 @@ CFLAGS
 cgit
 cgroup
 changeset
+Channel
 characterised
 CharString
 checkmark
@@ -999,7 +1000,6 @@ ttyACM
 ttyACMx
 ttymxc
 ttyUSB
-TvChannel
 TXD
 txt
 UART

diff --git a/examples/tv-app/android/java/ChannelManager.cpp b/examples/tv-app/android/java/ChannelManager.cpp
@@ -61,7 +61,7 @@ class ChannelInfoAttrAccess : public app::AttributeAccessInterface
 
 ChannelInfoAttrAccess gChannelAttrAccess;
 
-/** @brief Tv Channel  Cluster Init
+/** @brief Channel  Cluster Init
  *
  * This function is called when a specific cluster is initialized. It gives the
  * application an opportunity to take care of cluster initialization procedures.