From f1deb535ea423c27e25e61afc4d30267dec5212a Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Tue, 31 Oct 2017 14:23:47 +0000
Subject: Fix bad conflict resolution

---
 app/assets/javascripts/main.js | 5 +----
 1 file changed, 1 insertion(+), 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 || '/';
-- 
cgit v1.2.1