From 6e6910da91219fcb00d42a549c415c43e1af6b7b Mon Sep 17 00:00:00 2001 From: Dick Hollenbeck Date: Mon, 12 Jul 2010 11:01:20 -0500 Subject: [PATCH] oops, merge conflict, conflict fixed, then lost somehow --- include/common.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/common.h b/include/common.h index feb5c2834c..5a82d5503d 100644 --- a/include/common.h +++ b/include/common.h @@ -313,7 +313,7 @@ const wxString& valeur_param( int valeur, wxString& buf_texte ); * the format string must contain the %s format specifier. * @return The formatted units symbol. */ -wxString ReturnUnitSymbol( int aUnits = g_UnitMetric, +wxString ReturnUnitSymbol( UserUnitType aUnit = g_UserUnit, const wxString& aFormatString = _( " (%s):" ) ); /**