#RI-4661 - pull main

Author: AmirAllayarovSofteq

redisinsight/api/migration/index.ts

@@ -33,11 +33,8 @@ import { databaseRecommendations1681900503586 } from './1681900503586-database-r
 import { databaseRecommendationParams1683006064293 } from './1683006064293-database-recommendation-params';
 import { Feature1684931530343 } from './1684931530343-feature';
 import { DatabaseRedisServer1686719451753 } from './1686719451753-database-redis-server';
-<<<<<<< HEAD
 import { DatabaseRecommendationUnique1687435940110 } from './1687435940110-database-recommendation-unique';
-=======
 import { CloudDatabaseDetails1687166457712 } from './1687166457712-cloud-database-details';
->>>>>>> 803c4596763cb728c19e1617be04c912d66933f1
 
 export default [
   initialMigration1614164490968,
@@ -75,9 +72,6 @@ export default [
   databaseRecommendationParams1683006064293,
   Feature1684931530343,
   DatabaseRedisServer1686719451753,
-<<<<<<< HEAD
   DatabaseRecommendationUnique1687435940110,
-=======
   CloudDatabaseDetails1687166457712,
->>>>>>> 803c4596763cb728c19e1617be04c912d66933f1
 ];