diff options
author | slioch <slioch@eng-140.vyatta.com> | 2009-06-05 16:43:14 -0700 |
---|---|---|
committer | slioch <slioch@eng-140.vyatta.com> | 2009-06-05 16:44:33 -0700 |
commit | 6d762889ffa523806830795b5d1634475f9d14b0 (patch) | |
tree | 441ca87596cb7e08b0411f9c6c841846e865f781 /etc/shell | |
parent | cdebe1dc14fb277765f6102956a5e57e840c18f7 (diff) | |
download | vyatta-cfg-6d762889ffa523806830795b5d1634475f9d14b0.tar.gz vyatta-cfg-6d762889ffa523806830795b5d1634475f9d14b0.zip |
fix for bug 4505 merge is now called merge.
Diffstat (limited to 'etc/shell')
0 files changed, 0 insertions, 0 deletions