Build fix.
This commit is contained in:
parent
398231f9a7
commit
5423797ce4
@ -2,14 +2,9 @@
|
|||||||
///
|
///
|
||||||
/// # Example
|
/// # Example
|
||||||
/// ```
|
/// ```
|
||||||
<<<<<<< HEAD
|
|
||||||
/// extern crate ethcore_util;
|
|
||||||
/// use ethcore_util::semantic_version::*;
|
|
||||||
=======
|
|
||||||
/// extern crate ethcore_util as util;
|
/// extern crate ethcore_util as util;
|
||||||
/// use util::semantic_version::*;
|
/// use util::semantic_version::*;
|
||||||
///
|
///
|
||||||
>>>>>>> master
|
|
||||||
/// fn main() {
|
/// fn main() {
|
||||||
/// assert_eq!(SemanticVersion::new(1, 2, 3).as_u32(), 0x010203);
|
/// assert_eq!(SemanticVersion::new(1, 2, 3).as_u32(), 0x010203);
|
||||||
/// }
|
/// }
|
||||||
|
Loading…
Reference in New Issue
Block a user