From 1eebc33da96c41d7995ee7c7b07d046b71fc5008 Mon Sep 17 00:00:00 2001
From: Bertocq <bertocq@gmail.com>
Date: Mon, 19 Jun 2017 10:46:39 +0200
Subject: [PATCH] Fix bad merge conflict on rubocop_todo

---
 .rubocop_todo.yml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 2d239f006..19e3a59a6 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -14,7 +14,6 @@ Lint/InheritException:
   Exclude:
     - 'app/controllers/concerns/feature_flags.rb'
 
-<<<<<<< HEAD
 # Offense count: 13
 Lint/ParenthesesAsGroupedExpression:
   Exclude:
@@ -23,13 +22,6 @@ Lint/ParenthesesAsGroupedExpression:
     - 'spec/features/proposals_spec.rb'
     - 'spec/models/debate_spec.rb'
 
-# Offense count: 1
-Lint/UnderscorePrefixedVariableName:
-  Exclude:
-    - 'lib/manager_authenticator.rb'
-
-=======
->>>>>>> 0da0d145c... Fix Lint/UnderscorePrefixedVariableName issue and remove it from rubocop_todo file
 # Offense count: 4
 # Cop supports --auto-correct.
 # Configuration parameters: IgnoreEmptyBlocks, AllowUnusedKeywordArguments.