diff options
| author | slioch <slioch@eng-140.vyatta.com> | 2009-10-20 10:37:19 -0700 |
|---|---|---|
| committer | slioch <slioch@eng-140.vyatta.com> | 2009-10-20 10:37:19 -0700 |
| commit | 43276a1da7f1e1a49777349b7f6b1f1163e6b7ac (patch) | |
| tree | 003acced7de7f721ee462992263f2f8f927cd8b3 /.merge-branch-exclude | |
| parent | c35dbe5d353c0c48c2a65ee572433eac10f8060f (diff) | |
| download | vyatta-wanloadbalance-43276a1da7f1e1a49777349b7f6b1f1163e6b7ac.tar.gz vyatta-wanloadbalance-43276a1da7f1e1a49777349b7f6b1f1163e6b7ac.zip | |
updated merge exclusion file.
Diffstat (limited to '.merge-branch-exclude')
| -rw-r--r-- | .merge-branch-exclude | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.merge-branch-exclude b/.merge-branch-exclude index 7545094..2f64c2c 100644 --- a/.merge-branch-exclude +++ b/.merge-branch-exclude @@ -5,3 +5,4 @@ f759ad558ca04657a34ce02df51c2df87adae86f d2b49d1d24a6e70dce66b48341758d616cf8a475 5232c652ff7a069c7436ee19bfca7c1a47c4f0be 0816d20ff3a5eb7668350332a2f68141f8934712 +f91fcf8baf335132cbdad5d0e54f3c60151b6287 |