about summary refs log tree commit diff
path: root/Doc
diff options
context:
space:
mode:
authorBart Schaefer <barts@users.sourceforge.net>2000-07-20 15:51:04 +0000
committerBart Schaefer <barts@users.sourceforge.net>2000-07-20 15:51:04 +0000
commited263e32f9f2991e2854c15df525061004559ac0 (patch)
tree4924deb2f089a7314bbdc634a0f89fb55cefef22 /Doc
parent0db4a7e70b6a9af9a5ff6dcea6afeca87192f9bd (diff)
downloadzsh-ed263e32f9f2991e2854c15df525061004559ac0.tar.gz
zsh-ed263e32f9f2991e2854c15df525061004559ac0.tar.xz
zsh-ed263e32f9f2991e2854c15df525061004559ac0.zip
Fix bad conflict resolution.
Diffstat (limited to 'Doc')
0 files changed, 0 insertions, 0 deletions