aboutsummaryrefslogtreecommitdiff
path: root/COPYING
diff options
context:
space:
mode:
authorWolfgang Bangerth <bangerth@gcc.gnu.org>2003-05-15 09:02:27 -0600
committerWolfgang Bangerth <bangerth@gcc.gnu.org>2003-05-15 09:02:27 -0600
commitce000d1eec7bc89409426551325a1ac6ba233193 (patch)
tree2e1bf0fc46a6fa41a35f28efdce209d7885ad342 /COPYING
parent486772b126854e26f9dccf4fa6cd631757d7c045 (diff)
downloadgcc-ce000d1eec7bc89409426551325a1ac6ba233193.zip
gcc-ce000d1eec7bc89409426551325a1ac6ba233193.tar.gz
gcc-ce000d1eec7bc89409426551325a1ac6ba233193.tar.bz2
Remove the residuals of a previous merge conflict.
From-SVN: r66826
Diffstat (limited to 'COPYING')
0 files changed, 0 insertions, 0 deletions