summaryrefslogtreecommitdiff
path: root/.merge-branch-exclude
diff options
context:
space:
mode:
authorAn-Cheng Huang <ancheng@vyatta.com>2009-10-14 12:10:15 -0700
committerAn-Cheng Huang <ancheng@vyatta.com>2009-10-14 12:10:15 -0700
commit2dbce7e7c33d89856c541c55127e3b3f3e94da4d (patch)
treecfb195e75fd55cd92b0873ce5dd1900b958cc892 /.merge-branch-exclude
parent1e4f250d407fb060604f8c35732b568f61c41ef0 (diff)
downloadvyatta-cfg-system-2dbce7e7c33d89856c541c55127e3b3f3e94da4d.tar.gz
vyatta-cfg-system-2dbce7e7c33d89856c541c55127e3b3f3e94da4d.zip
update .merge-branch-exclude
Diffstat (limited to '.merge-branch-exclude')
-rw-r--r--.merge-branch-exclude9
1 files changed, 9 insertions, 0 deletions
diff --git a/.merge-branch-exclude b/.merge-branch-exclude
index 3c52dbd4..8518e4e8 100644
--- a/.merge-branch-exclude
+++ b/.merge-branch-exclude
@@ -1 +1,10 @@
47f054cb196959bb79960f3b6c1524b4ff7d32a8
+28aae71fe9f3e4da64c73eea4b79c5c08c5d8f9b
+a139c41faf9ccc7210218fcdf637a234967a6136
+08d0d9ed2d8824a446bfe6a1ba660db854f1a8f5
+bdbd1c9b842ad5931b33a1ccf483354a59ce8dab
+04ce9d5d2bead676a9961b91cb9ec41a0ec73d38
+c6b895817534113809c11c85d236d3170152df4f
+1cb034ae31da409a541b2275f8a8ba45e9434f9f
+3c6142ffeefc1575cfa5c0a370887c2eb0784b57
+a2e34c14b26ed7536f7068241a48cdd5d36e29d1