Unbreak run-pass/issue-2904 more

1 files changed, 0 insertions, 5 deletions

diff --git a/src/test/run-pass/issue-2904.rs b/src/test/run-pass/issue-2904.rs
index fc637429cd0..6d771dc7386 100644
--- 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)
     }