diff options
author | An-Cheng Huang <ancheng@vyatta.com> | 2009-10-14 13:10:37 -0700 |
---|---|---|
committer | An-Cheng Huang <ancheng@vyatta.com> | 2009-10-14 13:10:37 -0700 |
commit | 511ecf9b2d81a3b1b0e8c513d1c941e687533554 (patch) | |
tree | 27036bb58dfe9f681d11ebc5db357c9cb1ed2084 | |
parent | f97614e50a91c1924a0a762b470eeaca6a60ead1 (diff) | |
download | vyatta-cfg-quagga-511ecf9b2d81a3b1b0e8c513d1c941e687533554.tar.gz vyatta-cfg-quagga-511ecf9b2d81a3b1b0e8c513d1c941e687533554.zip |
add .merge-branch-exclude
-rw-r--r-- | .merge-branch-exclude | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/.merge-branch-exclude b/.merge-branch-exclude new file mode 100644 index 00000000..7cefb4a5 --- /dev/null +++ b/.merge-branch-exclude @@ -0,0 +1,7 @@ +84536c188e359a9f046bc8f1c5a3180b3e03ee8b +4cb6efba141b1e54ee78077410dd027a8fcf1a39 +31368eec9b7dd25e248140a8732fd4c814de52b9 +74b13263671bbcc61d34cf137b780e96bdfe1e8c +4fb63789bf16c0453ad202f73fc78c8e05c55b69 +4841cd902800ca500e34c5fd60b9a24227c22591 +037812d76a2bac67b20f75f42734581d915c8649 |