...missed a merge marker on that last rebase

Author: bstrie

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]