--- betzet/Framework/Classes/OutcomeGroups.class.php.working    - MINE
+++ betzet/Framework/Classes/OutcomeGroups.class.php    - MERGED
@@ -689,6 +689,13 @@
                OutcomeNames::OUTCOME_YES,
                OutcomeNames::OUTCOME_NO
        );
+<<<<<<< .working
+=======
+       static $OUTCOMES_COORDS_GENERIC = array(
+               OutcomeNames::OUTCOME_YES,
+               OutcomeNames::OUTCOME_NO
+       );
+>>>>>>> .merge-right.r15406
        static $OUTCOMES_BINGO_GENERIC = array(
                OutcomeNames::OUTCOME_YES,
                OutcomeNames::OUTCOME_NO
@@ -14910,6 +14917,12 @@
                SportTypes::SPORT_KENO => array(
                        self::OUTCOMES_GROUP_KENO_GENERIC_NAME,
                ),
+<<<<<<< .working
+=======
+               SportTypes::SPORT_COORDS => array(
+                       self::OUTCOMES_GROUP_COORDS_GENERIC_NAME,
+               ),
+>>>>>>> .merge-right.r15406
                SportTypes::SPORT_BINGO => array(
                        self::OUTCOMES_GROUP_BINGO_GENERIC_NAME,
                ),
@@ -17263,6 +17276,10 @@
                self::OUTCOMES_GROUP_POKERDICE_GENERIC_NAME,
                self::OUTCOMES_GROUP_FORTUNE_GENERIC_NAME,
                self::OUTCOMES_GROUP_KENO_GENERIC_NAME,
+<<<<<<< .working
+=======
+               self::OUTCOMES_GROUP_COORDS_GENERIC_NAME,
+>>>>>>> .merge-right.r15406
                self::OUTCOMES_GROUP_BINGO_GENERIC_NAME,
                self::OUTCOMES_GROUP_OTHERS_GENERIC_NAME,
                self::OUTCOMES_GROUP_OTHERS_THE_END_NAME,
@@ -20184,6 +20201,10 @@
                        self::$outcomeArrays[self::OUTCOMES_GROUP_POKERDICE_GENERIC_NAME] = self::$OUTCOMES_POKERDICE_GENERIC;
                        self::$outcomeArrays[self::OUTCOMES_GROUP_FORTUNE_GENERIC_NAME] = self::$OUTCOMES_FORTUNE_GENERIC;
                        self::$outcomeArrays[self::OUTCOMES_GROUP_KENO_GENERIC_NAME] = self::$OUTCOMES_KENO_GENERIC;
+<<<<<<< .working
+=======
+                       self::$outcomeArrays[self::OUTCOMES_GROUP_COORDS_GENERIC_NAME] = self::$OUTCOMES_COORDS_GENERIC;
+>>>>>>> .merge-right.r15406
                        self::$outcomeArrays[self::OUTCOMES_GROUP_BINGO_GENERIC_NAME] = self::$OUTCOMES_BINGO_GENERIC;
                        self::$outcomeArrays[self::OUTCOMES_GROUP_OTHERS_GENERIC_NAME] = self::$OUTCOMES_OTHERS_GENERIC;
                        self::$outcomeArrays[self::OUTCOMES_GROUP_OTHERS_THE_END_NAME] = self::$OUTCOMES_OTHERS_THE_END;
@@ -23378,6 +23399,10 @@
                        self::$russianGroupNames[self::OUTCOMES_GROUP_POKERDICE_GENERIC_NAME] = self::OUTCOMES_GROUP_POKERDICE_GENERIC_RUSSIAN_NAME;
                        self::$russianGroupNames[self::OUTCOMES_GROUP_FORTUNE_GENERIC_NAME] = self::OUTCOMES_GROUP_FORTUNE_GENERIC_RUSSIAN_NAME;
                        self::$russianGroupNames[self::OUTCOMES_GROUP_KENO_GENERIC_NAME] = self::OUTCOMES_GROUP_KENO_GENERIC_RUSSIAN_NAME;
+<<<<<<< .working
+=======
+                       self::$russianGroupNames[self::OUTCOMES_GROUP_COORDS_GENERIC_NAME] = self::OUTCOMES_GROUP_COORDS_GENERIC_RUSSIAN_NAME;
+>>>>>>> .merge-right.r15406
                        self::$russianGroupNames[self::OUTCOMES_GROUP_BINGO_GENERIC_NAME] = self::OUTCOMES_GROUP_BINGO_GENERIC_RUSSIAN_NAME;
                        self::$russianGroupNames[self::OUTCOMES_GROUP_OTHERS_GENERIC_NAME] = self::OUTCOMES_GROUP_OTHERS_GENERIC_RUSSIAN_NAME;
                        self::$russianGroupNames[self::OUTCOMES_GROUP_OTHERS_THE_END_NAME] = self::OUTCOMES_GROUP_OTHERS_THE_END_RUSSIAN_NAME;
@@ -25749,6 +25774,10 @@
                        self::$shortRussianGroupNames[self::OUTCOMES_GROUP_POKERDICE_GENERIC_NAME] = self::OUTCOMES_GROUP_POKERDICE_GENERIC_SHORT_RUSSIAN_NAME;
                        self::$shortRussianGroupNames[self::OUTCOMES_GROUP_FORTUNE_GENERIC_NAME] = self::OUTCOMES_GROUP_FORTUNE_GENERIC_SHORT_RUSSIAN_NAME;
                        self::$shortRussianGroupNames[self::OUTCOMES_GROUP_KENO_GENERIC_NAME] = self::OUTCOMES_GROUP_KENO_GENERIC_SHORT_RUSSIAN_NAME;
+<<<<<<< .working
+=======
+                       self::$shortRussianGroupNames[self::OUTCOMES_GROUP_COORDS_GENERIC_NAME] = self::OUTCOMES_GROUP_COORDS_GENERIC_SHORT_RUSSIAN_NAME;
+>>>>>>> .merge-right.r15406
                        self::$shortRussianGroupNames[self::OUTCOMES_GROUP_BINGO_GENERIC_NAME] = self::OUTCOMES_GROUP_BINGO_GENERIC_SHORT_RUSSIAN_NAME;
                        self::$shortRussianGroupNames[self::OUTCOMES_GROUP_OTHERS_GENERIC_NAME] = self::OUTCOMES_GROUP_OTHERS_GENERIC_SHORT_RUSSIAN_NAME;
                        self::$shortRussianGroupNames[self::OUTCOMES_GROUP_OTHERS_THE_END_NAME] = self::OUTCOMES_GROUP_OTHERS_THE_END_SHORT_RUSSIAN_NAME;