fixed merge problem

source/RobotAPI/interface/observers/ObserverFilters.ice

@@ -42,6 +42,12 @@ module armarx
 
     };
 
+    ["cpp:virtual"]
+    class MatrixMaxFilterBase extends DatafieldFilterBase
+    {
+
+    };
+
     ["cpp:virtual"]
     class MatrixMinFilterBase extends DatafieldFilterBase
     {