fix some merge fails

2017-10-09 21:01:24 +02:00
parent 659dbcb8c3
commit 72ac95267b
5 changed files with 28 additions and 31 deletions
--- a/utils/logging.go
+++ b/utils/logging.go
@@ -1,4 +1,4 @@
-package tools
+package utils

 import (
 	"os"