---

yaml
---
r: 30425
b: refs/heads/incoming
c: 12439b0
h: refs/heads/master
i:
  30423: 3f55a3d
v: v3

Author: olsonjeffery

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: 3e5815837594c3fdf2a67bc735a4b3de4009c798
+refs/heads/incoming: 12439b0b2480bc4186a972d8a9e7b5b4c1ece42f
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/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,