Permalink
Browse files

Fixed merge issue

  • Loading branch information...
Tom Bonner Tom Bonner
Tom Bonner authored and Tom Bonner committed Feb 6, 2012
1 parent 3ba933b commit 46672f67a67e85e3fda6b5a94a07fb87a13332ad
Showing with 0 additions and 3 deletions.
  1. +0 −3 README.md
View
@@ -360,11 +360,8 @@ Overview of unknown URL parsing.
**Unknown scheme**
-<<<<<<< HEAD
The parser will attempt to parse any type of URL it encounters based on its scheme. However, not all URLs are parsable, for example `spotify:track:<trackid>`. In this case, the following URL object is returned;
=======
-The parser will attempt to parse any type of URL it encounters based on its scheme. However, not all URLs are parsable, for example "spotify:track:<trackid>". In this case, the following URL object is returned;
->>>>>>> origin/master
``` javascript

0 comments on commit 46672f6

Please sign in to comment.