Fix Url query without values

fixes #12883
Icinga · Oct 14, 2016 · de783c7 · de783c7
1 parent a80334b
commit de783c7
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/lib/remote/url.cpp b/lib/remote/url.cpp
@@ -384,7 +384,11 @@ bool Url::ParseQuery(const String& query)
 		String key = token.SubStr(0, pHelper);
 		String value = Empty;
 
+<<<<<<< HEAD
 		if (pHelper != String::NPos && pHelper != token.GetLength() - 1)
+=======
+		if (pHelper != token.NPos && pHelper != token.GetLength() - 1)
+>>>>>>> Fix Url query without values
 			value = token.SubStr(pHelper+1);
 
 		if (!ValidateToken(value, ACQUERY))