From 7d36460851d536a84fa7657b9cad0c8429ca2771 Mon Sep 17 00:00:00 2001
From: Nicolas McCurdy <thenickperson@gmail.com>
Date: Sat, 4 Jan 2014 23:10:07 -0500
Subject: [PATCH] Rename the todo config to .rubocop.yml, now that more rubocop
 issues are fixed

---
 .rubocop.yml     | 19 ++++++++++++++++++-
 rubocop-todo.yml | 18 ------------------
 2 files changed, 18 insertions(+), 19 deletions(-)
 delete mode 100644 rubocop-todo.yml

diff --git a/.rubocop.yml b/.rubocop.yml
index 137ead8..b429de0 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1 +1,18 @@
-inherit_from: rubocop-todo.yml
+# This configuration was generated by `rubocop --auto-gen-config`.
+# The point is for the user to remove these configuration records
+# one by one as the offences are removed from the code base.
+
+ClassLength:
+  Enabled: false
+
+CyclomaticComplexity:
+  Max: 16
+
+Eval:
+  Enabled: false
+
+LineLength:
+  Max: 174
+
+MethodLength:
+  Max: 31
diff --git a/rubocop-todo.yml b/rubocop-todo.yml
deleted file mode 100644
index 225b514..0000000
--- a/rubocop-todo.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-# This configuration was generated by `rubocop --auto-gen-config`.
-# The point is for the user to remove these configuration records
-# one by one as the offences are removed from the code base.
-
-ClassLength:
-  Max: 350
-
-CyclomaticComplexity:
-  Max: 16
-
-Eval:
-  Enabled: false
-
-LineLength:
-  Max: 174
-
-MethodLength:
-  Max: 31