mirrors/notebook
3
0
Fork 0
mirror of https://github.com/indentlabs/notebook.git synced 2025-10-26 11:19:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

resolve merge leftovers

Browse Source
This commit is contained in:
Andrew Brown 2020-10-02 17:28:43 -07:00
parent ea3ba34b59
commit c900753575
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/timeline-editor.js
View File

@ -136,8 +136,4 @@ $(document).ready(function () {
// return false so we don't jump to the top of the page
return false;
});
<<<<<<< HEAD
=======
>>>>>>> master
});