From 62b298ee133d04ec88a252176fcfeb0da895181b Mon Sep 17 00:00:00 2001
From: Niko Matsakis <niko@alum.mit.edu>
Date: Tue, 15 Nov 2011 20:35:36 -0800
Subject: [PATCH] missed merges

---
 src/lib/io.rs | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/lib/io.rs b/src/lib/io.rs
index 5cb8e2231a5..37f46beff69 100644
--- a/src/lib/io.rs
+++ b/src/lib/io.rs
@@ -390,14 +390,9 @@ fn buffered_file_buf_writer(path: str) -> result::t<buf_writer, str> {
 
 
 // FIXME it would be great if this could be a const
-<<<<<<< HEAD
 // Problem seems to be that new_writer is not pure
-fn stdout() -> writer { ret new_writer(fd_buf_writer(1, option::none)); }
-fn stderr() -> writer { ret new_writer(fd_buf_writer(2, option::none)); }
-=======
 fn stdout() -> writer { ret new_writer(fd_buf_writer(1i32, option::none)); }
 fn stderr() -> writer { ret new_writer(fd_buf_writer(2i32, option::none)); }
->>>>>>> refactor all unix types
 
 fn print(s: str) { stdout().write_str(s); }
 fn println(s: str) { stdout().write_str(s + "\n"); }