X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=tox.ini;h=b19d07e978620aa4b96adbd69737eaf47a5aef8f;hb=refs%2Fchanges%2F80%2F29980%2F1;hp=a988fd7a1b5dfae711dbce95ffc98c7ad95fa404;hpb=815cbb45dff3fd759f2bd4608bb45ee7949dfc55;p=csit.git

diff --git a/tox.ini b/tox.ini
index a988fd7a1b..b19d07e978 100644
--- a/tox.ini
+++ b/tox.ini
@@ -88,7 +88,8 @@ commands = bash {[tox]checker_dir}/tc_naming.sh
 
 # Keep testenvs sorted alphabetically, please.
 
-# TODO: Migrate current docs check here.
+# TODO: Add a checker against unresolved merge conflicts.
+#       See: https://gerrit.fd.io/r/c/vpp/+/26956
 # TODO: Create voting "pylint violations should not increase" checker.
 # TODO: Create voting checker to reject suites with Force Tags of other suite.
 # TODO: Create voting checker against tags not in tag_documentation.rst file.