chore: fix merge conflicts and checking failing test

Signed-off-by: Pranshu Srivastava <iampranshu24@gmail.com>
keploy · May 13, 2024 · 7b3f09f · 7b3f09f
1 parent b0b34d9
commit 7b3f09f
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/cli/provider/service.go b/cli/provider/service.go
@@ -3,7 +3,7 @@ package provider
 import (
 	"context"
 	"errors"
-	// "strings"
+	"strings"
 
 	"go.keploy.io/server/v2/config"
 	"go.keploy.io/server/v2/pkg/core"
@@ -90,7 +90,7 @@ func (n *ServiceProvider) GetService(ctx context.Context, cmd string) (interface
 		if !utils.CheckFileExists("keploy.yml") {
 			toolsService := tools.NewTools(n.logger, tel)
 			// Trim the /keploy from path.
-			// n.cfg.Path = strings.TrimSuffix(n.cfg.Path, "/keploy")
+			n.cfg.Path = strings.TrimSuffix(n.cfg.Path, "/keploy")
 			yamlData, err := yaml.Marshal(n.cfg)
 			n.logger.Info("This is the config data", zap.String("data", string(yamlData)))
 			if err != nil {