Merge contradictory indent directives (google#3226)

durin42 · Jan 13, 2020 · d76fe9a · d76fe9a
1 parent 14758df
commit d76fe9a
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/.pylintrc b/.pylintrc
@@ -322,7 +322,7 @@ indent-after-paren=4
 
 # String used as indentation unit. This is usually "    " (4 spaces) or "\t" (1
 # tab).
-indent-string='    '
+indent-string='  '
 
 # Maximum number of characters on a single line.
 max-line-length=100
@@ -581,8 +581,5 @@ min-public-methods=2
 overgeneral-exceptions=BaseException,
                        Exception
 
-# String used as indentation unit. We differ from PEP8's normal 4 spaces.
-indent-string='  '
-
 # Maximum number of characters on a single line.
 max-line-length=80