From c1c108c870800a8bca6e59b6a91a75ba9c7af9fa Mon Sep 17 00:00:00 2001
From: Trask Stalnaker <trask.stalnaker@gmail.com>
Date: Mon, 27 Jun 2022 00:45:55 -0700
Subject: [PATCH] Remove checkstyle CommentsIndentation (#6219)

---
 buildscripts/checkstyle.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/buildscripts/checkstyle.xml b/buildscripts/checkstyle.xml
index becb6b4bc8..531e77dc2c 100644
--- a/buildscripts/checkstyle.xml
+++ b/buildscripts/checkstyle.xml
@@ -362,9 +362,10 @@
       <!-- modified from "expected" to "ignored" to match Intellij -->
       <property name="exceptionVariableName" value="ignored"/>
     </module>
-    <module name="CommentsIndentation">
+    <!-- using Google Java Format which sometimes conflicts with this indentation rule -->
+    <!-- module name="CommentsIndentation">
       <property name="tokens" value="SINGLE_LINE_COMMENT, BLOCK_COMMENT_BEGIN"/>
-    </module>
+    </module -->
     <!-- https://checkstyle.org/config_filters.html#SuppressionXpathFilter -->
     <module name="SuppressionXpathFilter">
       <property name="file" value="${org.checkstyle.google.suppressionxpathfilter.config}"