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 06:19:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #324 from appleboy/patch-12

Browse Source 
fix: some conflicts on examples.
This commit is contained in:
无闻
2017-02-11 07:58:31 -05:00
committed by GitHub
parent 65085a87c7 5a977ac0c4
commit aa47eb7e67
2 changed files with 22 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -1,17 +1,9 @@
package trans package trans
<<<<<<< HEAD
import "math"
import "math"
var Pi float64
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