summaryrefslogtreecommitdiff
path: root/etc/shell
diff options
context:
space:
mode:
authorslioch <slioch@eng-140.vyatta.com>2009-06-05 16:43:14 -0700
committerslioch <slioch@eng-140.vyatta.com>2009-06-05 16:44:33 -0700
commit6d762889ffa523806830795b5d1634475f9d14b0 (patch)
tree441ca87596cb7e08b0411f9c6c841846e865f781 /etc/shell
parentcdebe1dc14fb277765f6102956a5e57e840c18f7 (diff)
downloadvyatta-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