projects
/
libfirm
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Removed conflict in the header comment
[libfirm]
/
ir
/
ir
/
irreflect.h
diff --git
a/ir/ir/irreflect.h
b/ir/ir/irreflect.h
index
781f4a1
..
1416771
100644
(file)
--- 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