summaryrefslogtreecommitdiff
path: root/doc/CHANGES-2006
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2010-01-16 16:37:35 +0000
committerwiz <wiz@pkgsrc.org>2010-01-16 16:37:35 +0000
commit3c86bbd3c933adb072c99072e454bf779ef6ff62 (patch)
tree44be0dc384b256d7855bb8bfb0f8c92ad5e473ff /doc/CHANGES-2006
parent42c3d147b9d1cd1235cef49201a029ec40e3f92e (diff)
downloadpkgsrc-3c86bbd3c933adb072c99072e454bf779ef6ff62.tar.gz
Remove conflict markers. Hi tnn!
Diffstat (limited to 'doc/CHANGES-2006')
0 files changed, 0 insertions, 0 deletions