Merge branch 'master-PRE' into features/alert-in-apps-PRE

# Conflicts: # CHANGELOG.md # package-lock.json # package.json
Tiledesk · Apr 16, 2024 · d0b117c · d0b117c
2 parents 9e8e08f + 2760f1b
commit d0b117c
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -86,15 +86,10 @@
 - Deploys in production
 - Refactors the teammates table
 
-<<<<<<< HEAD
 ### 2.5.19
 - Deploys in production
 - Fixes the bug: not all chatbot images are displayed
 - Fixes the bug: published chatbots is appearing as a draft
-=======
-### 2.6.0-rc6
-- Fixes the bug: App cards are not of the same height
->>>>>>> master-PRE
 
 ### 2.6.0-rc4
 - Improves Knowledge Base

diff --git a/src/app/projects/projects.component.ts b/src/app/projects/projects.component.ts
@@ -156,6 +156,7 @@ export class ProjectsComponent implements OnInit, AfterContentInit, OnDestroy {
     this.unsubscribe$.next();
     this.unsubscribe$.complete();
   }
+
   getRouteParams() {
     this.route.queryParams.subscribe((params) => {
       this.logger.log('[PROJECTS] - GET ROUTE-PARAMS & APPID - params: ', params)