diff options
| author | rbalocca <rbalocca@vyatta.com> | 2008-04-02 15:02:34 -0700 |
|---|---|---|
| committer | rbalocca <rbalocca@vyatta.com> | 2008-04-02 15:02:34 -0700 |
| commit | 3b32db929c686de665bfb070409b1ff0d6b5288c (patch) | |
| tree | ac24ab4a860ed69911b5d5c37bc02356428f4ba7 /debian | |
| parent | e454ea809bbabbc1259faea0d211b5f669e9bb4a (diff) | |
| parent | 94d79ea2e51b31874b70f808beb8124c3537c974 (diff) | |
| download | vyatta-cfg-system-3b32db929c686de665bfb070409b1ff0d6b5288c.tar.gz vyatta-cfg-system-3b32db929c686de665bfb070409b1ff0d6b5288c.zip | |
Merge branch 'glendale' into hollywood
Conflicts:
debian/control
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/control | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/debian/control b/debian/control index 748ff063..05e8ee54 100644 --- a/debian/control +++ b/debian/control @@ -22,7 +22,6 @@ Depends: sed (>= 4.1.5), sudo, snmpd, keepalived, - vyatta-bash, bridge-utils, ssh, ed, |