From c9007535754bc7d8df447a74c4d7bfd0127e2ea4 Mon Sep 17 00:00:00 2001
From: Andrew Brown <drusepth@gmail.com>
Date: Fri, 2 Oct 2020 17:28:43 -0700
Subject: [PATCH] resolve merge leftovers

---
 app/assets/javascripts/timeline-editor.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/app/assets/javascripts/timeline-editor.js b/app/assets/javascripts/timeline-editor.js
index 664428eb..3c66c84b 100644
--- a/app/assets/javascripts/timeline-editor.js
+++ b/app/assets/javascripts/timeline-editor.js
@@ -136,8 +136,4 @@ $(document).ready(function () {
     // return false so we don't jump to the top of the page
     return false;
   });
-<<<<<<< HEAD
-=======
-
->>>>>>> master
 });