fix git merging issue

Author: asobolev

nix_mx.cc

@@ -261,35 +261,6 @@ void mexFunction(int            nlhs,
         methods->add("Property::values", nixproperty::values);
         methods->add("Property::updateValues", nixproperty::update_values);
 
-        classdef<nix::SetDimension>("SetDimension", methods)
-            .desc(&nixdimensions::describe)
-            .reg("set_labels", SETTER(const std::vector<std::string>&, nix::SetDimension, labels))
-            .reg("set_none_labels", SETTER(const boost::none_t, nix::SetDimension, labels));
-
-        classdef<nix::SampledDimension>("SampledDimension", methods)
-            .desc(&nixdimensions::describe)
-            .reg("set_label", SETTER(const std::string&, nix::SampledDimension, label))
-            .reg("set_none_label", SETTER(const boost::none_t, nix::SampledDimension, label))
-            .reg("set_unit", SETTER(const std::string&, nix::SampledDimension, unit))
-            .reg("set_none_unit", SETTER(const boost::none_t, nix::SampledDimension, unit))
-            .reg("set_sampling", SETTER(double, nix::SampledDimension, samplingInterval))
-            .reg("set_offset", SETTER(double, nix::SampledDimension, offset))
-            .reg("set_none_offset", SETTER(const boost::none_t, nix::SampledDimension, offset))
-            .reg("index_of", &nix::SampledDimension::indexOf)
-            .reg("position_at", &nix::SampledDimension::positionAt)
-            .reg("axis", &nix::SampledDimension::axis);
-        
-        classdef<nix::RangeDimension>("RangeDimension", methods)
-            .desc(&nixdimensions::describe)
-            .reg("set_label", SETTER(const std::string&, nix::RangeDimension, label))
-            .reg("set_none_label", SETTER(const boost::none_t, nix::RangeDimension, label))
-            .reg("set_unit", SETTER(const std::string&, nix::RangeDimension, unit))
-            .reg("set_none_unit", SETTER(const boost::none_t, nix::RangeDimension, unit))
-            .reg("set_ticks", SETTER(const std::vector<double>&, nix::RangeDimension, ticks))
-            .reg("index_of", &nix::RangeDimension::indexOf)
-            .reg("tick_at", &nix::RangeDimension::tickAt)
-            .reg("axis", &nix::RangeDimension::axis);
-
         classdef<nix::SetDimension>("SetDimension", methods)
             .desc(&nixdimensions::describe)
             .reg("set_labels", SETTER(const std::vector<std::string>&, nix::SetDimension, labels))