fix

BlueBrain · Sep 26, 2024 · 17af5f0 · 17af5f0
1 parent 662bbc4
commit 17af5f0
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/.pylintrc b/.pylintrc
@@ -4,11 +4,8 @@ disable=
 	invalid-name,
 	len-as-condition,
 	no-else-return,
-<<<<<<< before updating
     broad-exception-raised
-=======
 	too-many-positional-arguments
->>>>>>> after updating
 
 [FORMAT]
 # Regexp for a line that is allowed to be longer than the limit.