I hate vscode

2022-06-29 21:07:57 -04:00 · 2022-06-29 21:07:57 -04:00 · d845808a3c
parent a62f0b0759
commit d845808a3c
2 changed files with 0 additions and 6 deletions
--- a/logawl/logawl.go
+++ b/logawl/logawl.go
@ -1,8 +1,5 @@
-<<<<<<< HEAD
-=======
 // SPDX-License-Identifier: BSD-3-Clause

->>>>>>> upstream/master
 package logawl

 import (
--- a/logawl/logger.go
+++ b/logawl/logger.go
@ -1,8 +1,5 @@
-<<<<<<< HEAD
-=======
 // SPDX-License-Identifier: BSD-3-Clause

->>>>>>> upstream/master
 package logawl

 import (