Fixed botched merge.

(bzr r12380.1.18)

2 files changed, 2 insertions, 13 deletions

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'
diff --git a/src/util/units.h b/src/util/units.h
index ead49d3b4..c6f124203 100644
--- a/src/util/units.h
+++ b/src/util/units.h
@@ -65,20 +65,14 @@ class Unit {
      */
     int            defaultDigits() const;
 
+    bool           compatibleWith(const Unit *u) const;
+
     UnitType       type;
     double         factor;
     Glib::ustring  name;
     Glib::ustring  name_plural;
     Glib::ustring  abbr;
     Glib::ustring  description;
-
-    UnitType       type;
-
-    double         factor;
-
-    bool           isAbsolute() const { return type != UNIT_TYPE_DIMENSIONLESS; }
-    int            defaultDigits() const;
-    bool           compatibleWith(const Unit *u) const;
     
     friend bool operator== (const Unit &u1, const Unit &u2);
     friend bool operator!= (const Unit &u1, const Unit &u2);