diff -r 7685cec9fd3c -r f2ddfa555b0f doc/api/python/ccm.conflict.ObjectAndBaselineConflict-class.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/doc/api/python/ccm.conflict.ObjectAndBaselineConflict-class.html Fri Sep 11 11:54:49 2009 +0100 @@ -0,0 +1,226 @@ + + + + + ccm.conflict.ObjectAndBaselineConflict + + + + + + + + + + + + + + + + + + + + +
   Trees      Indices      Help   
+ + + + + +
+ + Package ccm :: + Module conflict :: + Class ObjectAndBaselineConflict + + + + + + +
[hide private]
[frames] | no frames]
+
+ +

Class ObjectAndBaselineConflict

source code

+
+Conflict --+
+           |
+          ObjectAndBaselineConflict
+
+ +
+ + + + + + + + + + + + +
+ + + + + +
Instance Methods[hide private]
+
+   + + + + + + +
__init__(self, + baseline, + object, + oat) + source code + +
+ +
+   + + + + + + +
comment(self) + source code + +
+ +
+ + + + + + +
+ + + + + +
Method Details[hide private]
+
+ +
+ +
+ + +
+

__init__(self, + baseline, + object, + oat) +
(Constructor) +

+ 		source code  +
+ + +
+
Overrides: + Conflict.__init__ +
+
+
+
+ +
+ +
+ + +
+

comment(self) +

+ 		source code  +
+ + +
+
Overrides: + Conflict.comment +
+
+
+
+
+ + + + + + + + + + + + + + + +
   Trees      Indices      Help   
+ + + + + +
+ Generated by Epydoc 3.0beta1 on Wed Sep 09 13:44:18 2009 + + http://epydoc.sourceforge.net +
+ + + + +