From d845808a3ca0efbbc0bed6969c914ad5d7af7140 Mon Sep 17 00:00:00 2001 From: grumbulon Date: Wed, 29 Jun 2022 21:07:57 -0400 Subject: [PATCH] I hate vscode --- logawl/logawl.go | 3 --- logawl/logger.go | 3 --- 2 files changed, 6 deletions(-) diff --git a/logawl/logawl.go b/logawl/logawl.go index 72ed413..02bdce8 100644 --- a/logawl/logawl.go +++ b/logawl/logawl.go @@ -1,8 +1,5 @@ -<<<<<<< HEAD -======= // SPDX-License-Identifier: BSD-3-Clause ->>>>>>> upstream/master package logawl import ( diff --git a/logawl/logger.go b/logawl/logger.go index ceca3ec..44ec205 100644 --- a/logawl/logger.go +++ b/logawl/logger.go @@ -1,8 +1,5 @@ -<<<<<<< HEAD -======= // SPDX-License-Identifier: BSD-3-Clause ->>>>>>> upstream/master package logawl import (