---

bstrie · brson · commit dedc21cdf645 · 2012-10-20T17:50:46.000-07:00
yaml --- r: 34839 b: refs/heads/master c: 41c37d9 h: refs/heads/master i: 34837: 04261e7 34835: 481dc3b 34831: 1b5427a v: v3
diff --git a/[refs] b/[refs]
@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 614624a34c7917c76927163ca3d82eef01e1c369
+refs/heads/master: 41c37d9d0f4bd8ee7f711d47d93e08e5687de3b4
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
 refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
diff --git a/trunk/src/libsyntax/ast.rs b/trunk/src/libsyntax/ast.rs
@@ -473,7 +473,6 @@ enum vstore {
 enum expr_vstore {
     // FIXME (#3469): Change uint to @expr (actually only constant exprs)
     expr_vstore_fixed(Option<uint>),   // [1,2,3,4]
->>>>>>> Remove old fixed-length vector syntax
     expr_vstore_uniq,                  // ~[1,2,3,4]
     expr_vstore_box,                   // @[1,2,3,4]
     expr_vstore_slice                  // &[1,2,3,4]
