forked from unknwon/the-way-to-go_ZH_CN
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
2 changed files
with
22 additions
and
42 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,25 +1,13 @@ | ||
| package main | ||
| <<<<<<< HEAD | ||
|
|
||
| ======= | ||
| >>>>>>> 0364d180eb1d1b8067d1248ace49ca46c816e541 | ||
| import ( | ||
| "fmt" | ||
| "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() { | ||
| 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 | ||
| package main | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "os" | ||
| ) | ||
|
|
||
| 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) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,9 @@ | ||
| package trans | ||
| <<<<<<< HEAD | ||
|
|
||
| import "math" | ||
|
|
||
| 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 | ||
| package trans | ||
|
|
||
| import "math" | ||
|
|
||
| var Pi float64 | ||
|
|
||
| func init() { | ||
| Pi = 4 * math.Atan(1) // init() function computes Pi | ||
| } |