diff options
| -rw-r--r-- | app/assets/javascripts/main.js | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js index e1a025e1e4e..e3ad15b6edd 100644 --- a/app/assets/javascripts/main.js +++ b/app/assets/javascripts/main.js @@ -133,11 +133,8 @@ $(function () { initBreadcrumbs(); initImporterStatus(); -<<<<<<< HEAD - initLogoAnimation(); -======= initTodoToggle(); ->>>>>>> master + initLogoAnimation(); // Set the default path for all cookies to GitLab's root directory Cookies.defaults.path = gon.relative_url_root || '/'; |