Commit a52e9b99 authored by Rom Walton's avatar Rom Walton

MGR: Fix build break

parent 59ed5461
......@@ -2695,8 +2695,5 @@ wxString FormatTime(double secs) {
wxString format_number(double x, int nprec) {
return wxNumberFormatter::ToString(x, nprec);
<<<<<<< HEAD
}
=======
}
>>>>>>> romw/wcg_streamlined_client
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