From afd79689f3fe230528c0e190a86d113d825a6945 Mon Sep 17 00:00:00 2001
From: anonish <safe@simpleharmonics.org>
Date: Sun, 8 Feb 2015 21:48:23 -0600
Subject: [PATCH] Cleanup for expand-video.js

---
 js/expand-video.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/js/expand-video.js b/js/expand-video.js
index f268d550..0e9ddcbb 100644
--- a/js/expand-video.js
+++ b/js/expand-video.js
@@ -356,8 +356,4 @@ onready(function(){
         });
         observer.observe(document.body, {childList: true, subtree: true});
     }
-<<<<<<< HEAD
 });
-=======
-});
->>>>>>> 02708219d3aea65bffe40f6bc893e08dda1290ec