2017.4.15

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

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