diff options
| author | Bart Schaefer <barts@users.sourceforge.net> | 2011-04-22 06:01:44 +0000 |
|---|---|---|
| committer | Bart Schaefer <barts@users.sourceforge.net> | 2011-04-22 06:01:44 +0000 |
| commit | e08e95afdb2a86d0e575e7498942e9fa0d055f59 (patch) | |
| tree | 77894274ec93b3b8bea41bd3b2e0ac002def10ad /Src/prompt.c | |
| parent | e349201f9a9521cd4e7db2bd3f6d5016ec33001b (diff) | |
| download | zsh-e08e95afdb2a86d0e575e7498942e9fa0d055f59.tar.gz zsh-e08e95afdb2a86d0e575e7498942e9fa0d055f59.tar.xz zsh-e08e95afdb2a86d0e575e7498942e9fa0d055f59.zip | |
remove stray conflict marker
Diffstat (limited to 'Src/prompt.c')
0 files changed, 0 insertions, 0 deletions