server/beego
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix all confict

Browse Source
This commit is contained in:
two
2018-07-26 14:34:25 +08:00
parent 38a2f32252
commit 31c746d9d7
2 changed files with 6 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
logs/logger_test.go
View File

@@ -30,13 +30,8 @@ func TestFormatHeader_0(t *testing.T) {
if tm.Year() >= 2100 {
break
}
<<<<<<< HEAD
h, _, _ := formatTimeHeader(tm)
if tm.Format("2006/01/02 15:04:05.999 ") != string(h) {
=======
h, _ := formatTimeHeader(tm)
if tm.Format("2006/01/02 15:04:05.000 ") != string(h) {
>>>>>>> old/develop
t.Log(tm)
t.FailNow()
}
@@ -53,13 +48,8 @@ func TestFormatHeader_1(t *testing.T) {
if tm.Year() >= year+1 {
break
}
<<<<<<< HEAD
h, _, _ := formatTimeHeader(tm)
if tm.Format("2006/01/02 15:04:05.999 ") != string(h) {
=======
h, _ := formatTimeHeader(tm)
if tm.Format("2006/01/02 15:04:05.000 ") != string(h) {
>>>>>>> old/develop
t.Log(tm)
t.FailNow()
}