diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-10-31 14:23:47 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-10-31 14:23:59 +0000 |
| commit | f1deb535ea423c27e25e61afc4d30267dec5212a (patch) | |
| tree | 8520f0939ac87c375eda8bfd80fa41386b79e182 | |
| parent | bf82d23a0a1c2ffe9f3da123775df55a3eb141e5 (diff) | |
| download | gitlab-ce-38869-labels.tar.gz | |
Fix bad conflict resolution38869-labels
| -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 || '/'; |