--- a/ChangeSetDiffComponent.st	Wed Aug 01 15:21:03 2012 +0100
+++ b/ChangeSetDiffComponent.st	Wed Aug 01 18:38:51 2012 +0100
@@ -217,6 +217,14 @@
 
 !ChangeSetDiffComponent methodsFor:'testing'!
 
+isConflict
+    "Return true, if there is a conflict."
+
+    ^ self subclassResponsibility
+
+    "Modified (comment): / 01-08-2012 / 17:11:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
 isDiffItem
     ^ false
 !
@@ -230,6 +238,13 @@
     ^false
 !
 
+isForCopyrightMethod
+    "Returns true, if this is an entry for #copyright method"
+    ^self subclassResponsibility
+
+    "Created: / 01-08-2012 / 16:37:53 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
 isForVersionMethod
     "Returns true, if this is an entry for version method"
     ^self subclassResponsibility
@@ -246,7 +261,7 @@
 !ChangeSetDiffComponent class methodsFor:'documentation'!
 
 version
-    ^ '$Id: ChangeSetDiffComponent.st 1946 2012-07-31 14:00:47Z vranyj1 $'
+    ^ '$Id: ChangeSetDiffComponent.st 1952 2012-08-01 17:38:51Z vranyj1 $'
 !
 
 version_CVS
@@ -254,5 +269,5 @@
 !
 
 version_SVN
-    ^ '$Id: ChangeSetDiffComponent.st 1946 2012-07-31 14:00:47Z vranyj1 $'
+    ^ '$Id: ChangeSetDiffComponent.st 1952 2012-08-01 17:38:51Z vranyj1 $'
 ! !