Merge remote-tracking branch 'origin/master'
Conflicts: data/src/hello/main1.go
This commit is contained in:
commit
7f5fae9cc8
|
@ -2,11 +2,8 @@ package main
|
|||
|
||||
import (
|
||||
"fmt"
|
||||
"time"
|
||||
)
|
||||
|
||||
func main() {
|
||||
fmt.Println("Hello, 世界")
|
||||
|
||||
time.Sleep(time.Second)
|
||||
fmt.Println("Hello, 世界")
|
||||
}
|
||||
|
|
|
@ -0,0 +1,9 @@
|
|||
package main
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
)
|
||||
|
||||
func main() {
|
||||
fmt.Println("Hello, 世界")
|
||||
}
|
Loading…
Reference in New Issue