Remove merge conflict markings

freyacodes · freyacodes · commit 77d2ac03382f · 2021-10-26T16:05:47.000+02:00
diff --git a/IMPLEMENTATION.md b/IMPLEMENTATION.md
@@ -460,12 +460,8 @@ Response:
   "isStream": false,
   "position": 0,
   "title": "Rick Astley - Never Gonna Give You Up",
-<<<<<<< HEAD
   "uri": "https://www.youtube.com/watch?v=dQw4w9WgXcQ",
   "sourceName": "youtube"
-=======
-  "uri": "https://www.youtube.com/watch?v=dQw4w9WgXcQ"
->>>>>>> master
 }
 ```
 
