Build fix.

src/semantic_version.rs

@@ -2,14 +2,9 @@
 /// 
 /// # Example
 /// ```
-<<<<<<< HEAD
-/// extern crate ethcore_util;
-/// use ethcore_util::semantic_version::*;
-=======
 /// extern crate ethcore_util as util;
 /// use util::semantic_version::*;
 /// 
->>>>>>> master
 /// fn main() {
 ///   assert_eq!(SemanticVersion::new(1, 2, 3).as_u32(), 0x010203);
 /// }