Fixing scope

2014-11-26 15:55:04 +01:00 · 2014-11-26 15:55:04 +01:00 · ddad02b3fc
parent b725b6c6e1
commit ddad02b3fc
1 changed files with 0 additions and 6 deletions
--- 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