7x31/the-way-to-go_ZH_CN
1
0
Fork 0
mirror of https://github.com/unknwon/the-way-to-go_ZH_CN.git synced 2025-08-12 04:48:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: some conflicts on examples.

Browse Source
This commit is contained in:
Bo-Yi Wu
2017-02-11 20:47:59 +08:00
parent 65085a87c7
commit 5a977ac0c4
2 changed files with 22 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
eBook/examples/chapter_4/goos.go
View File

@@ -1,25 +1,13 @@
package main package main
<<<<<<< HEAD
=======
>>>>>>> 0364d180eb1d1b8067d1248ace49ca46c816e541
import ( import (
"fmt" "fmt"
"os" "os"
) )
<<<<<<< HEAD
func main() {
var goos string = os.Getenv("GOOS")
fmt.Printf("The operating system is: %s\n", goos)
path := os.Getenv("PATH")
fmt.Printf("Path is %s\n", path)
}
=======
func main() { func main() {
var goos string = os.Getenv("GOOS") var goos string = os.Getenv("GOOS")
fmt.Printf("The operating system is: %s\n", goos) fmt.Printf("The operating system is: %s\n", goos)
path := os.Getenv("PATH") path := os.Getenv("PATH")
fmt.Printf("Path is %s\n", path) fmt.Printf("Path is %s\n", path)
} }
>>>>>>> 0364d180eb1d1b8067d1248ace49ca46c816e541

8
eBook/examples/chapter_4/init.go
View File

@@ -1,5 +1,4 @@
package trans package trans
<<<<<<< HEAD
import "math" import "math"
@@ -8,10 +7,3 @@ var Pi float64
func init() { func init() {
Pi = 4 * math.Atan(1) // init() function computes Pi Pi = 4 * math.Atan(1) // init() function computes Pi
} }
=======
import "math"
var Pi float64
func init() {
Pi = 4 * math.Atan(1) // init() function computes Pi
}
>>>>>>> 0364d180eb1d1b8067d1248ace49ca46c816e541