Skip to content

K
kicad-source-mirror
Commit 6e6910da authored by Dick Hollenbeck's avatar Dick Hollenbeck
Browse files
Options

oops, merge conflict, conflict fixed, then lost somehow

parent d16bc738
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
include/common.h
View file @ 6e6910da
...@@ -313,7 +313,7 @@ const wxString& valeur_param( int valeur, wxString& buf_texte ); ...@@ -313,7 +313,7 @@ const wxString& valeur_param( int valeur, wxString& buf_texte );
* the format string must contain the %s format specifier. * the format string must contain the %s format specifier.
* @return The formatted units symbol. * @return The formatted units symbol.
*/ */
wxString ReturnUnitSymbol( int aUnits = g_UnitMetric, wxString ReturnUnitSymbol( UserUnitType aUnit = g_UserUnit,
const wxString& aFormatString = _( " (%s):" ) ); const wxString& aFormatString = _( " (%s):" ) );
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment