From 31edbbd32ec0e88a08d5d57e62d1d876679e6896 Mon Sep 17 00:00:00 2001
From: Roxie Gibson <me@roxxers.xyz>
Date: Thu, 16 Sep 2021 11:35:18 +0100
Subject: [PATCH] fix: git metadata not removed in merge

---
 cli/app/logs.go | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/cli/app/logs.go b/cli/app/logs.go
index a95d08f1..771cd582 100644
--- 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)