summary refs log tree commit diff
path: root/StartupFiles
diff options
context:
space:
mode:
authorBart Schaefer <barts@users.sourceforge.net>2005-05-27 01:14:04 +0000
committerBart Schaefer <barts@users.sourceforge.net>2005-05-27 01:14:04 +0000
commit80b79f9fd903d1b1a74fad54dfd1d0c79e670e36 (patch)
treee7f636ad67514394c37e12ca21c1286555300484 /StartupFiles
parent31c2d8369e6d6347599593b6272f32f15468ff81 (diff)
downloadzsh-80b79f9fd903d1b1a74fad54dfd1d0c79e670e36.tar.gz
zsh-80b79f9fd903d1b1a74fad54dfd1d0c79e670e36.tar.xz
zsh-80b79f9fd903d1b1a74fad54dfd1d0c79e670e36.zip
Remove CVS conflict marker left by Doug.
Diffstat (limited to 'StartupFiles')
0 files changed, 0 insertions, 0 deletions