From b3d9d9b73cb9cae6b76e0a040756784112ed88a9 Mon Sep 17 00:00:00 2001
From: Eric Holk <eholk@mozilla.com>
Date: Fri, 29 Jul 2011 18:52:16 -0700
Subject: Objectified library chans and ports.

---
 src/rt/rust_builtin.cpp | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/rt/rust_builtin.cpp')

diff --git a/src/rt/rust_builtin.cpp b/src/rt/rust_builtin.cpp
index 143a0b22f73..989e0a4800a 100644
--- a/src/rt/rust_builtin.cpp
+++ b/src/rt/rust_builtin.cpp
@@ -912,7 +912,6 @@ void drop_chan(rust_task *task, rust_chan *chan) {
 extern "C" CDECL
 void drop_port(rust_task *, rust_port *port) {
     port->ref_count--;
->>>>>>> Started working on a library-based comm system. Creating and deleting ports work.
 }
 
 //
-- 
cgit 1.4.1-3-g733a5