From bd456907434bc0fd286e9170bdc5ceab492f8783 Mon Sep 17 00:00:00 2001
From: Nicola Lanzilotto <nicola@tiledesk.com>
Date: Fri, 26 Apr 2024 15:38:34 +0200
Subject: [PATCH] Updates version

---
 CHANGELOG.md      | 10 +++++++---
 package-lock.json |  2 +-
 package.json      |  2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4a5c0d863922..f496a4df4045 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # tiledesk-dashboard
 
+### 2.6.18-rc1
+- Hides the External chatbot learn more button if the DOCS key is set to false
+- Fixes the bug: Chatbot limit does not work when set to 0
+- Refactors the home page UI for teammates with agent role
+- Adds the lazy loading to the  "HomeGoToChatComponent" and "ChatbotAlertComponent" components
+- Improves chatbots and knowledge bases management via DB
+
 ### 2.6.17
 - Deploys in production
 - Fixes the bug: Agents can't edit requester information
@@ -12,12 +19,9 @@
 - Deploys in production
 - Improves performance and bug fixing
 
-<<<<<<< HEAD
-=======
 ### 2.6.15-rc1
 - Improves performance and bug fixing
 
->>>>>>> master-PRE
 ### 2.6.14
 - Deploys in production
 - Improves performance and bug fixing
diff --git a/package-lock.json b/package-lock.json
index 530df411b060..5d460167c457 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "@tiledesk/tiledesk-dashboard",
-  "version": "2.6.17",
+  "version": "2.6.18-rc1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index fe9c583f1485..e6270f614043 100755
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tiledesk/tiledesk-dashboard",
-  "version": "2.6.17",
+  "version": "2.6.18-rc1",
   "scripts": {
     "ng": "ng",
     "start": "ng serve --aot",