From 56e4c82a38cfb2bcf7de2d6323dab0073a70726d Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Thu, 28 Nov 2013 18:03:38 -0800
Subject: Test fixes and merge conflicts

---
 src/libextra/lib.rs | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/libextra')

diff --git a/src/libextra/lib.rs b/src/libextra/lib.rs
index 571891f1830..ce504d8bf6f 100644
--- a/src/libextra/lib.rs
+++ b/src/libextra/lib.rs
@@ -40,6 +40,7 @@ Rust extras are part of the standard Rust distribution.
 
 #[deny(non_camel_case_types)];
 #[deny(missing_doc)];
+#[allow(attribute_usage)]; // NOTE: remove after the next snapshot
 
 use std::str::{StrSlice, OwnedStr};
 
-- 
cgit 1.4.1-3-g733a5