From ffb2836ed79a30ddf7bd1b267fa917eba516f2e6 Mon Sep 17 00:00:00 2001
From: Thorsten Eckel <te@znuny.com>
Date: Tue, 5 May 2015 15:06:43 +0200
Subject: [PATCH] Removed cop 'Style/OneLineConditional', no changes needed.

---
 .rubocop.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 04611fe54..d6c72118d 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -270,8 +270,6 @@ Rails/Validation:
   Enabled: false
 Style/MultilineOperationIndentation:
   Enabled: false
-Style/OneLineConditional:
-  Enabled: false
 Lint/Eval:
   Enabled: false
 Style/ModuleFunction: