# HG changeset patch
# User sandnerr
# Date 851075329 -3600
# Node ID 1c86efd8cafc344691f5a8ce53227e4c13df1340
# Parent  08cca0a2ea6b976703aafa096af155dcfbfd388d
testing cvs merge algorithm, 2nd

diff -r 08cca0a2ea6b -r 1c86efd8cafc src/HOLCF/cvstest
--- a/src/HOLCF/cvstest	Fri Dec 20 10:48:05 1996 +0100
+++ b/src/HOLCF/cvstest	Fri Dec 20 10:48:49 1996 +0100
@@ -1,3 +1,4 @@
    asdfa  dsf
         yxcv
 qwerqewrqwer
+brabbel
\ No newline at end of file