--- a/RCSConflictEditTextView.st	Wed Jul 18 09:25:57 2012 +0100
+++ b/RCSConflictEditTextView.st	Wed Jul 18 10:57:46 2012 +0100
@@ -9,8 +9,6 @@
  other person.  No title to or ownership of the software is
  hereby transferred.
 "
-
-
 "{ Package: 'stx:libtool' }"
 
 EditTextView subclass:#RCSConflictEditTextView
@@ -154,5 +152,9 @@
 !RCSConflictEditTextView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/RCSConflictEditTextView.st,v 1.3 2006/07/05 07:42:02 fm Exp $'
+    ^ '$Id: RCSConflictEditTextView.st 8016 2012-07-18 09:57:46Z vranyj1 $'
+!
+
+version_SVN
+    ^ '$Id:: RCSConflictEditTextView.st 8016 2012-07-18 09:57:46Z vranyj1                                                           $'
 ! !