From ddad02b3fcbc272ee24bada786395b3a6898f604 Mon Sep 17 00:00:00 2001
From: Alejandro Alonso <alejandro.alonso@kaleidos.net>
Date: Wed, 26 Nov 2014 15:55:04 +0100
Subject: [PATCH] Fixing scope

---
 app/coffee/modules/team/main.coffee | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/app/coffee/modules/team/main.coffee b/app/coffee/modules/team/main.coffee
index f91d6ec3..4d37a0d7 100644
--- a/app/coffee/modules/team/main.coffee
+++ b/app/coffee/modules/team/main.coffee
@@ -56,12 +56,6 @@ class TeamController extends mixOf(taiga.Controller, taiga.PageMixin)
         # On Error
         promise.then null, @.onInitialDataError.bind(@)
 
-<<<<<<< HEAD
-=======
-        @scope.currentUser = @auth.getUser()
-        @scope.projectId = @rootscope.projectId
-
->>>>>>> Allowing leave project
     setRole: (role) ->
         if role
             @scope.filtersRole = role