resolve conflicts. again...

Artem · Artem · commit 9e3444d59967 · 2022-12-14T13:45:46.000+02:00
diff --git a/redisinsight/api/src/modules/redis/redis.service.ts b/redisinsight/api/src/modules/redis/redis.service.ts
@@ -190,7 +190,7 @@ export class RedisService {
     return client;
   }
 
-  public async createClientAutomatically(database: Database, tool: AppTool, connectionName) {
+  public async createClientAutomatically(database: Database, tool: ClientContext, connectionName) {
     // try sentinel connection
     if (database?.sentinelMaster) {
       try {

Original file line number	Diff line number	Diff line change
`@@ -190,7 +190,7 @@ export class RedisService {`
`190`	`190`	`return client;`
`191`	`191`	`}`
`192`	`192`
`193`		`- public async createClientAutomatically(database: Database, tool: AppTool, connectionName) {`
	`193`	`+ public async createClientAutomatically(database: Database, tool: ClientContext, connectionName) {`
`194`	`194`	`// try sentinel connection`
`195`	`195`	`if (database?.sentinelMaster) {`
`196`	`196`	`try {`