fix one confict

2018-07-26 14:29:26 +08:00
parent 1a42154c64 d55f54a8ab
commit 38a2f32252
55 changed files with 1123 additions and 334 deletions
--- a/logs/logger.go
+++ b/logs/logger.go
@@ -93,7 +93,7 @@ const (
 func formatTimeHeader(when time.Time) ([]byte, int, int) {
 	y, mo, d := when.Date()
 	h, mi, s := when.Clock()
-	ns := when.Nanosecond()/1000000
+	ns := when.Nanosecond() / 1000000
 	//len("2006/01/02 15:04:05.123 ")==24
 	var buf [24]byte