# HG changeset patch
# User joachim99
# Date 1065876748 0
# Node ID e0bb6c85203a6d5e948ebe93fde79e2b5b2846f0
# Parent  675b2ed580b2fd42802d752868de27a0060f2bc4
Line endings corrected

diff -r 675b2ed580b2 -r e0bb6c85203a kdiff3/src/merger.h
--- a/kdiff3/src/merger.h	Sat Oct 11 12:50:38 2003 +0000
+++ b/kdiff3/src/merger.h	Sat Oct 11 12:52:28 2003 +0000
@@ -17,9 +17,11 @@
 
 /***************************************************************************
  * $Log$
+ * Revision 1.2  2003/10/11 12:52:28  joachim99
+ * Line endings corrected
+ *
  * Revision 1.1  2003/10/06 18:38:48  joachim99
  * KDiff3 version 0.9.70
- *                                                                   *
  ***************************************************************************/
 
 #ifndef MERGER_H