From a62ec74c736032143738f0a81202a75fc4e1768d Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Thu, 11 Apr 2019 12:07:41 -0600
Subject: [PATCH] prepare for release

---
 CHANGELOG.md    |  4 ++--
 blueprints.yaml | 16 ++++++----------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4df9d313..e47b8d89 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,7 +23,6 @@
     * Flex user profile now uses Flex Form
     * Moved dashboard `notifications` logic to server-side for increased performance (1 request instead of 3)
     * Refactored feeds logic for better performance
-    * Updated languages
     * Better logic for delete action to support Ajax. Fixes Flex lists
     * Cleanly handle session corruption due to changing Flex object types
     * Implemented [ForkAwesome](https://forkawesome.github.io/Fork-Awesome/) and removed FontAwesome + LineAwesome
@@ -34,7 +33,8 @@
     * Take admin setting for 2FA into account when showing user 2FA badge [#1568](https://github.com/getgrav/grav-plugin-admin/issues/1568)
     * Moved `ignore` and `key` field into form plugin  
     * Improved usability of `System` configuration blueprint with side-tabs
-    * Cleaned up UI in `Scheduler` tools page      
+    * Cleaned up UI in `Scheduler` tools page 
+    * Updated languages     
 1. [](#bugfix)
     * Fixed user edit links if Flex Objects plugin is installed but user isn't Flex User
     * Fixed deprecated `sameas()` Twig test
diff --git a/blueprints.yaml b/blueprints.yaml
index d307d2cc..22b5faac 100644
--- a/blueprints.yaml
+++ b/blueprints.yaml
@@ -1,10 +1,6 @@
 name: Admin Panel
-<<<<<<< HEAD
-version: 1.8.20
-=======
-version: 1.9.0-rc.4
-testing: true
->>>>>>> 1.9
+version: 1.9.0
+testing: false
 description: Adds an advanced administration panel to manage your site
 icon: empire
 author:
@@ -18,10 +14,10 @@ docs: https://github.com/getgrav/grav-plugin-admin/blob/develop/README.md
 license: MIT
 
 dependencies:
-    - { name: grav, version: '>=1.6.0-rc.4' }
-    - { name: form, version: '>=3.0.0-rc.4' }
-    - { name: login, version: '>=3.0.0-rc.4' }
-    - { name: email, version: '>=3.0.0-rc.4' }
+    - { name: grav, version: '>=1.6.0' }
+    - { name: form, version: '>=3.0.0' }
+    - { name: login, version: '>=3.0.0' }
+    - { name: email, version: '>=3.0.0' }
 
 form:
   validation: loose