From dfefef815b9e37373a5a5cd76a7129fdb5a397b2 Mon Sep 17 00:00:00 2001
From: didier amyot <didier.amyot@gmail.com>
Date: Tue, 23 May 2017 22:37:04 -0400
Subject: [PATCH] fix rebasing

---
 script/teams.js | 31 ++++++++++---------------------
 1 file changed, 10 insertions(+), 21 deletions(-)

diff --git a/script/teams.js b/script/teams.js
index 28e5246..2988680 100644
--- a/script/teams.js
+++ b/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;
 });