From d76fe9aeeb24b3e31741ce1573810fc17147948c Mon Sep 17 00:00:00 2001
From: jonathanmetzman <31354670+jonathanmetzman@users.noreply.github.com>
Date: Mon, 13 Jan 2020 09:34:28 -0800
Subject: Merge contradictory indent directives (#3226)

---
 .pylintrc | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to '.pylintrc')

diff --git a/.pylintrc b/.pylintrc
index 60bdfd4c..00878f72 100644
--- 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
\ No newline at end of file
-- 
cgit v1.2.3