oops, merge conflict, conflict fixed, then lost somehow

2010-07-12 11:01:20 -05:00 · 2010-07-12 11:01:20 -05:00 · 6e6910da91
parent d16bc738f3
commit 6e6910da91
1 changed files with 1 additions and 1 deletions
--- 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):" ) );

 /**