From 763c82153bb246974a9cc02aa392d22907592710 Mon Sep 17 00:00:00 2001
From: Daniel K <FredyC@users.noreply.github.com>
Date: Fri, 29 Mar 2019 13:56:55 +0100
Subject: [PATCH] Consolidate Renovate config

* Delete .renovaterc.json

* Update renovate.json
---
 .renovaterc.json | 7 -------
 renovate.json    | 7 ++++++-
 2 files changed, 6 insertions(+), 8 deletions(-)
 delete mode 100644 .renovaterc.json

diff --git a/.renovaterc.json b/.renovaterc.json
deleted file mode 100644
index 0dba3a8f..00000000
--- a/.renovaterc.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "automerge": true,
-  "automergeType": "branch",
-  "major": {
-    "automerge": false
-  }
-}
diff --git a/renovate.json b/renovate.json
index f45d8f11..29c7e13d 100644
--- a/renovate.json
+++ b/renovate.json
@@ -1,5 +1,10 @@
 {
   "extends": [
     "config:base"
-  ]
+  ],
+  "automerge": true,
+  "automergeType": "branch",
+  "major": {
+    "automerge": false
+  }    
 }