diff options
| author | An-Cheng Huang <ancheng@vyatta.com> | 2011-02-01 16:57:52 -0800 |
|---|---|---|
| committer | An-Cheng Huang <ancheng@vyatta.com> | 2011-02-01 16:57:52 -0800 |
| commit | 504d9a97def87f4eff15307a272795e70c2a915a (patch) | |
| tree | 6c6ffd4323df07f8c2a4bb9a9e6df4b48ce6600b /.merge-branch-exclude | |
| parent | fa99a35967bcaf6a42bd58bcb2808769d4223a50 (diff) | |
| download | vyatta-cfg-504d9a97def87f4eff15307a272795e70c2a915a.tar.gz vyatta-cfg-504d9a97def87f4eff15307a272795e70c2a915a.zip | |
exclude change from merge
Diffstat (limited to '.merge-branch-exclude')
| -rw-r--r-- | .merge-branch-exclude | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.merge-branch-exclude b/.merge-branch-exclude index 461c816..ec99e10 100644 --- a/.merge-branch-exclude +++ b/.merge-branch-exclude @@ -1,4 +1,4 @@ 6521907e2deb6b13a9048334d70657a2c4f12b73 fdcf5294b4a60c2a1a75e40442cb09b58e470885 4935b31eb6b6c755f7ce3e0102a60996c1b1d633 - +0e51f32d8fa8a8cff5d844e3c6802e1d4372cee8 |