--- a/ScrollableView.st	Wed Mar 19 16:43:47 1997 +0100
+++ b/ScrollableView.st	Wed Mar 19 16:49:31 1997 +0100
@@ -612,11 +612,6 @@
         newView scrolledView:aScrolledView.
     ].
 
-<<<<<<< ScrView.st
-=======
-"/    newView setupDimensions.
-
->>>>>>> 1.53
     org notNil ifTrue:[
         newView origin:org
     ].
@@ -645,12 +640,8 @@
      top open
     "
 
-<<<<<<< ScrView.st
     "Modified: 6.3.1997 / 18:42:40 / cg"
     "Modified: 19.3.1997 / 15:32:51 / stefan"
-=======
-    "Modified: 19.3.1997 / 15:16:37 / cg"
->>>>>>> 1.53
 !
 
 forView:aView in:aSuperView
@@ -863,12 +854,8 @@
         ].
     ]
 
-<<<<<<< ScrView.st
     "Modified: 7.3.1997 / 22:24:43 / cg"
     "Modified: 19.3.1997 / 15:32:37 / stefan"
-=======
-    "Modified: 19.3.1997 / 15:08:18 / cg"
->>>>>>> 1.53
 !
 
 verticalScrollBar
@@ -1056,25 +1043,14 @@
         ].
 
         anyChange ifTrue:[
-<<<<<<< ScrView.st
             realized ifTrue:[
                 self setupDimensions.
             ].
         ].
-=======
-            realized ifTrue:[
-                self setupDimensions.
-            ]
-        ]
->>>>>>> 1.53
     ].
 
-<<<<<<< ScrView.st
     "Modified: 7.3.1997 / 22:58:56 / cg"
     "Modified: 19.3.1997 / 15:33:36 / stefan"
-=======
-    "Modified: 19.3.1997 / 15:09:23 / cg"
->>>>>>> 1.53
 ! !
 
 !ScrollableView methodsFor:'event processing'!
@@ -1240,12 +1216,8 @@
 
     self updateScrollBarVisibility
 
-<<<<<<< ScrView.st
     "Modified: 7.3.1997 / 22:22:33 / cg"
     "Modified: 19.3.1997 / 15:32:20 / stefan"
-=======
-    "Modified: 19.3.1997 / 15:07:56 / cg"
->>>>>>> 1.53
 !
 
 releaseHorizontalScrollBar
@@ -1740,5 +1712,5 @@
 !ScrollableView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/ScrollableView.st,v 1.54 1997-03-19 15:43:47 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/ScrollableView.st,v 1.55 1997-03-19 15:49:31 stefan Exp $'
 ! !