Removed conflict in the header comment
authorMichael Beck <beck@ipd.info.uni-karlsruhe.de>
Wed, 6 Oct 2004 08:22:51 +0000 (08:22 +0000)
committerMichael Beck <beck@ipd.info.uni-karlsruhe.de>
Wed, 6 Oct 2004 08:22:51 +0000 (08:22 +0000)
commit83c392f1ff1e2a1102f045dea03a57b015a007aa
tree3f662c0d531b7694ce09384373b9fb61a9d98e25
parent4e28c552ca19e1778dd39c616b0d72956de678c3
Removed conflict in the header comment

[r4062]
ir/ir/irreflect.h