update book code

This commit is contained in:
Unknwon
2015-03-03 12:25:25 -05:00
parent b8c82ba4e5
commit eab1d98ba8
465 changed files with 15392 additions and 1572 deletions

View File

@@ -1,25 +1,25 @@
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
<<<<<<< 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