From 12439b0b2480bc4186a972d8a9e7b5b4c1ece42f Mon Sep 17 00:00:00 2001
From: Jeff Olson <olson.jeffery@gmail.com>
Date: Fri, 7 Sep 2012 15:58:45 -0700
Subject: [PATCH] core: missed rebase cruft cleanup

---
 src/libcore/task.rs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/libcore/task.rs b/src/libcore/task.rs
index 3bdfe152aec..bee810fceba 100644
--- a/src/libcore/task.rs
+++ b/src/libcore/task.rs
@@ -1037,11 +1037,7 @@ fn each_ancestor(list:        &mut AncestorList,
 struct TCB {
     me:            *rust_task,
     // List of tasks with whose fates this one's is intertwined.
-<<<<<<< HEAD
     tasks:         TaskGroupArc, // 'none' means the group has failed.
-=======
-    let tasks:         TaskGroupArc; // 'None' means the group has failed.
->>>>>>> core: port task.rs to comm::Chan/Port to pipes::Chan/Port
     // Lists of tasks who will kill us if they fail, but whom we won't kill.
     mut ancestors: AncestorList,
     is_main:       bool,