Merge pull request #324 from appleboy/patch-12

fix: some conflicts on examples.

eBook/examples/chapter_4/goos.go

@@ -1,13 +1,9 @@
 package main
-<<<<<<< HEAD
 
-=======
->>>>>>> 0364d180eb1d1b8067d1248ace49ca46c816e541
 import (
 	"fmt"
 	"os"
 )
-<<<<<<< HEAD
 
 func main() {
 	var goos string = os.Getenv("GOOS")
@@ -15,11 +11,3 @@ func main() {
 	path := os.Getenv("PATH")
 	fmt.Printf("Path is %s\n", path)
 }
-=======
-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)
-}
->>>>>>> 0364d180eb1d1b8067d1248ace49ca46c816e541

eBook/examples/chapter_4/init.go

@@ -1,5 +1,4 @@
 package trans
-<<<<<<< HEAD
 
 import "math"
 
@@ -8,10 +7,3 @@ var Pi float64
 func init() {
 	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