From 4847fae03082c7f2e7c6b4be5eda98acc397ec27 Mon Sep 17 00:00:00 2001
From: Tomas Hajny <hajny@freepascal.org>
Date: Wed, 24 May 2006 22:51:23 +0000
Subject: [PATCH]   * cosmetic - trash at the end removed

git-svn-id: trunk@3662 -
---
 rtl/inc/matrix.pp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/rtl/inc/matrix.pp b/rtl/inc/matrix.pp
index 44ae3633de..3efc6a2ee1 100644
--- a/rtl/inc/matrix.pp
+++ b/rtl/inc/matrix.pp
@@ -821,6 +821,3 @@ implementation
 {$i mmatimp.inc}
 
 end.
-<<<<<<< .mine
-=======
->>>>>>> .r41