---

yaml
---
r: 33854
b: refs/heads/snap-stage3
c: 65bd40e
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 9b95d511316ae7124046de61d19335fdfaa021cc
+refs/heads/snap-stage3: 65bd40e300323f1e4806dd84834b8d71bb89c08c
 refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/libcore/core.rc

@@ -144,7 +144,7 @@ pub mod send_map;
 
 // Concurrency
 pub mod comm;
-#[merge = "task/mod.rs"]
+#[path = "task/mod.rs"]
 pub mod task;
 pub mod pipes;