Unbreak run-pass/issue-2904 more

brson · brson · commit 87a72567f05c · 2012-09-26T18:41:02.000-07:00
diff --git a/src/test/run-pass/issue-2904.rs b/src/test/run-pass/issue-2904.rs
@@ -52,13 +52,8 @@ fn read_board_grid<rdr: Owned io::Reader>(+in: rdr) -> ~[~[square]] {
     let mut grid = ~[];
     for in.each_line |line| {
         let mut row = ~[];
-<<<<<<< HEAD
         for str::each_char(line) |c| {
-            vec::push(row, square_from_char(c))
-=======
-        for line.each_char |c| {
             row.push(square_from_char(c))
->>>>>>> Demode vec::push (and convert to method)
         }
         grid.push(row)
     }

Original file line number	Diff line number	Diff line change
`@@ -52,13 +52,8 @@ fn read_board_grid<rdr: Owned io::Reader>(+in: rdr) -> ~[~[square]] {`
`52`	`52`	`let mut grid = ~[];`
`53`	`53`	`for in.each_line \|line\| {`
`54`	`54`	`let mut row = ~[];`
`55`		`-<<<<<<< HEAD`
`56`	`55`	`for str::each_char(line) \|c\| {`
`57`		`- vec::push(row, square_from_char(c))`
`58`		`-=======`
`59`		`- for line.each_char \|c\| {`
`60`	`56`	`row.push(square_from_char(c))`
`61`		`->>>>>>> Demode vec::push (and convert to method)`
`62`	`57`	`}`
`63`	`58`	`grid.push(row)`
`64`	`59`	`}`