Merge branch 'v0.6.x'

# Conflicts:
#	serde/src/de/mod.rs
#	serde_codegen/src/attr.rs
#	serde_codegen/src/de.rs
#	serde_codegen/src/lib.rs
This commit is contained in:
Erick Tryzelaar
2016-02-12 21:43:23 -08:00
9 changed files with 58 additions and 57 deletions
+1 -1
View File
@@ -8,7 +8,7 @@ use num::rational::Ratio;
use serde::de::{Deserializer, Visitor};
use token::{Error, Token, assert_de_tokens, assert_de_tokens_ignore};
use token::{Token, assert_de_tokens, assert_de_tokens_ignore};
//////////////////////////////////////////////////////////////////////////