fix: git metadata not removed in merge

2021-09-16 11:35:18 +01:00 · 2021-09-16 11:35:18 +01:00 · 31edbbd32e
parent 0a1c73bf00
commit 31edbbd32e
1 changed files with 0 additions and 5 deletions
--- a/cli/app/logs.go
+++ b/cli/app/logs.go
@ -70,12 +70,7 @@ var appLogsCommand = &cli.Command{

 		serviceName := c.Args().Get(1)
 		if serviceName == "" {
-<<<<<<< HEAD
-			logrus.Debug("tailing logs for all app services")
-			stackLogs(app.StackName(), cl)
-=======
 			stackLogs(c, app.StackName(), cl)
->>>>>>> bcaf285 (refactor: use cli context vs creating new one)
 		}
 		logrus.Debugf("tailing logs for '%s'", serviceName)