diff options
| author | Bart Schaefer <barts@users.sourceforge.net> | 2005-05-27 01:14:04 +0000 |
|---|---|---|
| committer | Bart Schaefer <barts@users.sourceforge.net> | 2005-05-27 01:14:04 +0000 |
| commit | 80b79f9fd903d1b1a74fad54dfd1d0c79e670e36 (patch) | |
| tree | e7f636ad67514394c37e12ca21c1286555300484 /ChangeLog | |
| parent | 31c2d8369e6d6347599593b6272f32f15468ff81 (diff) | |
| download | zsh-80b79f9fd903d1b1a74fad54dfd1d0c79e670e36.tar.gz zsh-80b79f9fd903d1b1a74fad54dfd1d0c79e670e36.tar.xz zsh-80b79f9fd903d1b1a74fad54dfd1d0c79e670e36.zip | |
Remove CVS conflict marker left by Doug.
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 73a30f6d1..92192de37 100644 --- a/ChangeLog +++ b/ChangeLog @@ -24,7 +24,6 @@ * unposted: Completion/Base/Widget/_complete_debug: add a colon command so name and version of zsh appear in debug output. ->>>>>>> 1.2661 2005-05-21 Doug Kearns <djkea2@gus.gscit.monash.edu.au> * unposted: Completion/Unix/Command/_webbrowser: add firefox to |