diff options
| author | schwab <schwab@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-08-20 11:37:13 +0000 |
|---|---|---|
| committer | schwab <schwab@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-08-20 11:37:13 +0000 |
| commit | a354af935a45c31ba19d3e1a29ee8cab3a23787c (patch) | |
| tree | 536c9769cbe5d4dbc988a025e0a43042a19c1953 /gcc/java/java-except.h | |
| parent | 030ec15c9ed4f1f1de8f01f9c7988e2f65bc8e2f (diff) | |
| download | ppe42-gcc-a354af935a45c31ba19d3e1a29ee8cab3a23787c.tar.gz ppe42-gcc-a354af935a45c31ba19d3e1a29ee8cab3a23787c.zip | |
Remove conflict marker.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@86312 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/java/java-except.h')
0 files changed, 0 insertions, 0 deletions
