fix: git metadata not removed in merge
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
This commit is contained in:
parent
0a1c73bf00
commit
31edbbd32e
|
@ -70,12 +70,7 @@ var appLogsCommand = &cli.Command{
|
||||||
|
|
||||||
serviceName := c.Args().Get(1)
|
serviceName := c.Args().Get(1)
|
||||||
if serviceName == "" {
|
if serviceName == "" {
|
||||||
<<<<<<< HEAD
|
|
||||||
logrus.Debug("tailing logs for all app services")
|
|
||||||
stackLogs(app.StackName(), cl)
|
|
||||||
=======
|
|
||||||
stackLogs(c, app.StackName(), cl)
|
stackLogs(c, app.StackName(), cl)
|
||||||
>>>>>>> bcaf285 (refactor: use cli context vs creating new one)
|
|
||||||
}
|
}
|
||||||
logrus.Debugf("tailing logs for '%s'", serviceName)
|
logrus.Debugf("tailing logs for '%s'", serviceName)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue