From 63071dedd65d63cfac2041399dab0191e3753b42 Mon Sep 17 00:00:00 2001 From: Matthew Petroff Date: Wed, 17 Jul 2013 01:31:18 -0400 Subject: Fixed botched merge. (bzr r12380.1.18) --- src/util/units.cpp | 5 ----- 1 file changed, 5 deletions(-) (limited to 'src/util/units.cpp') diff --git a/src/util/units.cpp b/src/util/units.cpp index f6350d569..d485f6aef 100644 --- a/src/util/units.cpp +++ b/src/util/units.cpp @@ -196,11 +196,6 @@ int Unit::metric() const { return 0; } -/** - * Initializes the unit tables and identifies the primary unit types. - * - * The primary unit's conversion factor is required to be 1.00 - */ UnitTable::UnitTable() { // if we swich to the xml file, don't forget to force locale to 'C' -- cgit v1.2.3