Fix warning in log on ScreenRanking.

2007-05-31 18:58:55 +00:00
parent d71e313dd2
commit 75fc300d14
1 changed files with 0 additions and 5 deletions
@@ -796,12 +796,7 @@ PlayerType="Player"
 PlayerInitCommand=y,SCREEN_CENTER_Y
 StartGivesUp=true
 BackGivesUp=false
-<<<<<<< metrics.ini
-FailOnMissCombo=30
-FailAfter30Misses=false
-=======
 FailOnMissCombo=-1
->>>>>>> 1.1491
 GivingUpGoesToPrevScreen=false
 GivingUpGoesToNextScreen=false
 InitialBackgroundBrightness=1