oops, merge conflict, conflict fixed, then lost somehow

6e6910da · Dick Hollenbeck · d16bc738 · 6e6910da
Commit 6e6910da authored Jul 12, 2010 by Dick Hollenbeck
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

common.h include/common.h +1 -1

No files found.
--- 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):" ) );

 /**