fix rebasing

script/teams.js

@@ -1,27 +1,6 @@
 define(['m', '_'], function (m, _) {
     var teams = {};
 
-<<<<<<< HEAD
-    teams.getTeamColor = function(teamName){
-        if(teamName == 'jaune'){
-            return '#FF0';
-        }
-        if(teamName == 'rouge'){
-            return '#F00';
-        }
-        if(teamName == 'bleu'){
-            return '#00F';
-        }
-        if(teamName == 'gris'){
-            return '#808080';
-        }
-        if(teamName == 'orange'){
-            return '#FFA500';
-        }
-        if(teamName == 'vert'){
-            return '#008000';
-        }
-
     teams.teams = function(){
         return [
             {name: 'jaune', color: '#FF0'},
@@ -33,6 +12,16 @@ define(['m', '_'], function (m, _) {
         ];
     };
 
+    teams.getTeamColor = function(teamName){
+        var color;
+        _.each(teams.teams(), function(team){
+            if(team.name == teamName){
+                color = team.color;
+                return false;
+            }
+        });
+        return color;
+    };
 
     return teams;
 });