wassname/DefinitelyTyped
1
0
Fork 0
mirror of https://github.com/wassname/DefinitelyTyped.git synced 2026-09-09 11:13:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup bad merge artifacts in videojs

Browse Source
This commit is contained in:
Vincent Bortone
2013-02-13 11:59:05 -05:00
parent 0dceceb3a0
commit c053830ef1
2 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
videojs/videojs-tests.ts
+1 -5
View File
@@ -1,7 +1,6 @@
// Tests for Video.js API
/// <reference path="videojs.d.ts" />
<<<<<<< HEAD
_V_("example_video_1").ready(function(){
var myPlayer:VideoJSPlayer = this;
@@ -72,7 +71,4 @@ _V_("example_video_1").ready(function(){
myPlayer.addEvent("volumechange", myFunc);
myPlayer.removeEvent("volumechange", myFunc);
});
=======
var myPlayer:VideoJSPlayer = _V_("example_video_1");
>>>>>>> f8b142ba4c1a906b03601cd1f0d53484250f11b3
});
videojs/videojs.d.ts
Vendored
-3
View File
@@ -26,10 +26,7 @@ interface VideoJSPlayer {
src(newSource: VideoJSSource): VideoJSPlayer;
src(newSource: VideoJSSource[]): VideoJSPlayer;
currentTime(seconds: number): VideoJSPlayer;
<<<<<<< HEAD
currentTime(): number;
=======
>>>>>>> f8b142ba4c1a906b03601cd1f0d53484250f11b3
duration(): number;
buffered(): TimeRanges;
bufferedPercent(): number;