aboutsummaryrefslogtreecommitdiff
path: root/COPYING
diff options
context:
space:
mode:
authorMichael Olson <mwolson@gnu.org>2007-03-06 02:36:00 +0000
committerMichael Olson <mwolson@gnu.org>2007-03-06 02:36:00 +0000
commit15807814c2d6d8ca1cfb9f386480dbdab11a8f73 (patch)
treeaa0329ea8ac6f79e64503d78ca2ec55fd402ceaa /COPYING
parent3b20b7fd3462d5d9d712ee4f199cd0b23e05faaa (diff)
Resolve conflict in change to manual
darcs-hash:20070306023616-1bfb2-b06a97541a28ee7e84793b4de5a78b872b3f0756.gz
Diffstat (limited to 'COPYING')
0 files changed, 0 insertions, 0 deletions