Merge remote-tracking branch 'origin/master'

Juntaran · Juntaran · commit 1949f5252c3f · 2017-04-15T09:46:56.000+08:00
# Conflicts:
#	Data_Structure/Link_List/link_list.go
diff --git a/Data_Structure/Link_List/link_list.go b/Data_Structure/Link_List/link_list.go
@@ -300,6 +300,7 @@ func (list *List) PrintList() {
 		fmt.Println()
 	}
 }
+<<<<<<< HEAD
 
 // 对链表中的每个元素执行函数
 func (list *List) DoEach(f func(node ListNode))  {
@@ -319,3 +320,5 @@ func (list *List) Items() []*interface{} {
 	return items
 }
 
+=======
+>>>>>>> origin/master

Original file line number	Diff line number	Diff line change
`@@ -300,6 +300,7 @@ func (list *List) PrintList() {`
`300`	`300`	`fmt.Println()`
`301`	`301`	`}`
`302`	`302`	`}`
	`303`	`+<<<<<<< HEAD`
`303`	`304`
`304`	`305`	`// 对链表中的每个元素执行函数`
`305`	`306`	`func (list *List) DoEach(f func(node ListNode)) {`
`@@ -319,3 +320,5 @@ func (list List) Items() []interface{} {`
`319`	`320`	`return items`
`320`	`321`	`}`
`321`	`322`
	`323`	`+=======`
	`324`	`+>>>>>>> origin/master`