Fixing left-in merge markers.

deanberris · deanberris · commit 743dd78be71b · 2010-01-09T00:35:25.000+08:00
diff --git a/boost/network/uri/http/detail/parse_specific.hpp b/boost/network/uri/http/detail/parse_specific.hpp
@@ -86,7 +86,6 @@ namespace boost { namespace network { namespace uri {
                                 parts.fragment
                            );
 
-<<<<<<< HEAD:boost/network/uri/http/detail/parse_specific.hpp
                 qi::rule<iterator, string_type::value_type()> gen_delims = qi::char_(":/?#[]@");
                 qi::rule<iterator, string_type::value_type()> sub_delims = qi::char_("!$&'()*+,;=");
 
@@ -96,12 +95,8 @@ namespace boost { namespace network { namespace uri {
 
                 qi::rule<iterator, string_type()> pchar = qi::raw[unreserved | pct_encoded | sub_delims | qi::char_(":@")];
                 
-                hostname<tags::http>::parser<iterator> hostname;
-                bool ok = qi::parse(
-=======
                 hostname<tags::http_default_8bit_tcp_resolve>::parser<iterator> hostname;
                 bool ok = parse(
->>>>>>> 01140d24f86ceffddabc6f42077ca08d5e4f9e3f:boost/network/uri/http/detail/parse_specific.hpp
                         start_, end_,
                         (
                          qi::lit("//")
diff --git a/boost/network/uri/http/uri.hpp b/boost/network/uri/http/uri.hpp
@@ -31,15 +31,9 @@ namespace boost { namespace network { namespace uri {
                 return parts_.host;
             }
 
-<<<<<<< HEAD:boost/network/uri/http/uri.hpp
-            uint16_t port() const {
-                return parts_.port ? *parts_.port : 
-                    (parts_.scheme == "https" ? 443u : 80u);
-=======
             uint32_t port() const {
                 return parts_.port ? *(parts_.port) : 
                     (boost::iequals(parts_.scheme, string_type("https")) ? 443u : 80u);
->>>>>>> 01140d24f86ceffddabc6f42077ca08d5e4f9e3f:boost/network/uri/http/uri.hpp
             }
 
             string_type path() const {
@@ -67,13 +61,8 @@ namespace boost { namespace network { namespace uri {
         }
 
     inline
-<<<<<<< HEAD:boost/network/uri/http/uri.hpp
-        uint16_t
-        port(basic_uri<tags::http> const & uri) {
-=======
         uint32_t
         port(basic_uri<tags::http_default_8bit_tcp_resolve> const & uri) {
->>>>>>> 01140d24f86ceffddabc6f42077ca08d5e4f9e3f:boost/network/uri/http/uri.hpp
             return uri.port();
         }
 
