From 83c392f1ff1e2a1102f045dea03a57b015a007aa Mon Sep 17 00:00:00 2001
From: Michael Beck <beck@ipd.info.uni-karlsruhe.de>
Date: Wed, 6 Oct 2004 08:22:51 +0000
Subject: [PATCH] Removed conflict in the header comment

[r4062]
---
 ir/ir/irreflect.h | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/ir/ir/irreflect.h b/ir/ir/irreflect.h
index 781f4a102..14167712c 100644
--- a/ir/ir/irreflect.h
+++ b/ir/ir/irreflect.h
@@ -4,11 +4,7 @@
  * @author Sebastian Hack
  * @brief Reflection for Firm operations.
  *
-<<<<<<< irreflect.h
  * $Id$
-=======
- * $Id$
->>>>>>> 1.2
  */
 
 #ifndef __REFLECT_H
-- 
2.20.1