Merge https://github.com/astaxie/build-web-application-with-golang

Conflicts: 2.3.md
2012-09-22 16:04:29 +08:00
parent 65aa4e36d2 707af97968
commit 06d36a5140
2 changed files with 6 additions and 2 deletions
--- a/2.3.md
+++ b/2.3.md
@@ -384,7 +384,11 @@ Go里面有一个不错的设计，就是回调函数，有点类似面向对象
 		return false
 	}

+<<<<<<< HEAD
 	// 声明的函数类型在这个地方当做了一个参数
+=======
+	//声明的函数类型在这个地方当做了一个参数
+>>>>>>> 707af97968bca65f2f1ba6a95132911b25585603
 	func filter(slice []int, f testInt) []int {
 		var result []int
 		for _, value := range slice {