typo

normenster · Jun 20, 2016 · 7759dec · 7759dec
1 parent a04144b
commit 7759dec
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/tests/unit/loader/playlist-loader.js b/tests/unit/loader/playlist-loader.js
@@ -479,5 +479,4 @@ Rollover38803/20160525T064049-01-69844069.ts
     assert.strictEqual(result.fragments[2].url, 'http://video.example.com/Rollover38803/20160525T064049-01-69844069.ts');
     assert.strictEqual(result.fragments[2].programDateTime.getTime(), 1464366904000);
   });
->>>>>>> master
 });