core: Inherit non-allocating slice functionality

[rust.git] / src / libserialize / json.rs

diff --git a/src/libserialize/json.rs b/src/libserialize/json.rs
index d1fe04bccf8f0036aedde2624c775eb4ea2ba6db..29315c458108fa20ff8d3c2b71788843d14f986e 100644 (file)
--- a/src/libserialize/json.rs
+++ b/src/libserialize/json.rs
@@ -1398,7 +1398,6 @@ fn parse_str(&mut self) -> Result<~str, ParserError> {
                     'n' => res.push_char('\n'),
                     'r' => res.push_char('\r'),
                     't' => res.push_char('\t'),
-//<<<<<<< HEAD
                     'u' => match try!(self.decode_hex_escape()) {
                         0xDC00 .. 0xDFFF => return self.error(LoneLeadingSurrogateInHexEscape),