testing cvs merge algorithm
authorsandnerr
Fri, 20 Dec 1996 10:45:08 +0100
changeset 2461 3cf050730233
parent 2460 e9ef33e0d061
child 2462 08cca0a2ea6b
testing cvs merge algorithm
src/HOLCF/cvstest
--- a/src/HOLCF/cvstest	Fri Dec 20 10:39:44 1996 +0100
+++ b/src/HOLCF/cvstest	Fri Dec 20 10:45:08 1996 +0100
@@ -1,3 +1,4 @@
    asdfa  dsf
         yxcv
 qwerqewrqwer
+brabbel
\ No newline at end of file