From ea9989a39a15d1f44d6a53347ac56b0bcf529e7d Mon Sep 17 00:00:00 2001
From: Daniel Parker <danielaparker@yahoo.com>
Date: Thu, 5 Dec 2024 16:47:51 -0500
Subject: [PATCH] Fix uri

---
 include/jsoncons/utility/uri.hpp | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/include/jsoncons/utility/uri.hpp b/include/jsoncons/utility/uri.hpp
index d6f268d27..8bc89d93b 100644
--- a/include/jsoncons/utility/uri.hpp
+++ b/include/jsoncons/utility/uri.hpp
@@ -531,16 +531,7 @@ namespace jsoncons {
             }
             return decoded;
         }
-<<<<<<< HEAD
-<<<<<<< Updated upstream
-        static uri parse(const std::string& s, std::error_code& ec)
-=======
-        
-        static uri parse(const std::string& str, std::error_code& ec)
->>>>>>> Stashed changes
-=======
         static uri parse(const std::string& str, std::error_code& ec)
->>>>>>> 09f9fec566acd325e4d0e8706ebda05e3290386a
         {
             part_type scheme;
             part_type userinfo;