Resolve merge conflict

b95505017 · Aug 4, 2015 · 9a2a204 · 9a2a204
2 parents a7d843f + 9e6ef63
commit 9a2a204
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
@@ -26,7 +26,6 @@
 * TTML: Improved handling of whitespace.
 * DASH: Support Mpd.Location element.
 * Add option to TsExtractor to allow non-IDR keyframes.
-* Added MulticastDataSource for connecting to multicast streams.
 * (WorkInProgress) - First steps to supporting seeking in DASH DVR window.
 * (WorkInProgress) - First steps to supporting styled + positioned subtitles.
 * Misc bug fixes.