From b3e9705315504e14be3502f21c752a04d774b40e Mon Sep 17 00:00:00 2001
From: Sean Burke <hellfyre@users.sourceforge.net>
Date: Sat, 30 Aug 2003 09:38:53 +0000
Subject: [PATCH] Fix up the default metrics a bit.

---
 stepmania/Themes/default/metrics.ini | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index 70a7003c83..7bb07a5d3b 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -2323,17 +2323,16 @@ Medium=STANDARD
 Hard=HEAVY
 Challenge=CHALLENGE
 
-
 [ScreenRaveOptions]
 PrevScreenArcade=	// should never get here
 PrevScreenNonstop=	// should never get here
-PrevScreenOni=	// should never get here
+PrevScreenOni=		// should never get here
 PrevScreenEndless=	// should never get here
 PrevScreenBattle=	// should never get here
 PrevScreenRave=ScreenSelectMusic
 NextScreenArcade=	// should never get here
 NextScreenNonstop=	// should never get here
-NextScreenOni=	// should never get here
+NextScreenOni=		// should never get here
 NextScreenEndless=	// should never get here
 NextScreenBattle=	// should never get here
 NextScreenRave=ScreenStage
@@ -2418,14 +2417,10 @@ TimerSeconds=40
 NextScreen=ScreenSelectMusic
 
 [BeginnerHelper]
-// All X,Y coordinates are relative to the HelperX,Y
+# All X,Y coordinates are relative to the HelperX,Y
 Player1_X=-125
 Player2_X=125
 PlayerAngle=40
 DancePadAngle=36
 HelperX=320
-<<<<<<< metrics.ini
-HelperY=320=======
 HelperY=320
-
->>>>>>> 1.303