From c053830ef1326b9d76ffe960065907d7ffeaccb9 Mon Sep 17 00:00:00 2001
From: Vincent Bortone <vbortone@gmail.com>
Date: Wed, 13 Feb 2013 11:55:58 -0500
Subject: [PATCH] Cleanup bad merge artifacts in videojs

---
 videojs/videojs-tests.ts | 6 +-----
 videojs/videojs.d.ts     | 3 ---
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/videojs/videojs-tests.ts b/videojs/videojs-tests.ts
index 37f8d5fda..7995339ac 100644
--- a/videojs/videojs-tests.ts
+++ b/videojs/videojs-tests.ts
@@ -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
+});
\ No newline at end of file
diff --git a/videojs/videojs.d.ts b/videojs/videojs.d.ts
index 17834c22e..49fb1c09a 100644
--- a/videojs/videojs.d.ts
+++ b/videojs/videojs.d.ts
@@ -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;