summaryrefslogtreecommitdiff
path: root/.merge-branch-exclude
diff options
context:
space:
mode:
authorRobert Bays <robert@vyatta.com>2010-11-10 18:14:12 -0800
committerRobert Bays <robert@vyatta.com>2010-11-10 18:14:12 -0800
commit2b500bb648942a90e53d774a68da31c52b9d14ac (patch)
tree301962c266bca0c4ac24ad55c01be45e0edf3a6c /.merge-branch-exclude
parent6b69d3abfdec9f29a06e5dfe4ce6fd918c6fa9fd (diff)
downloadvyatta-cfg-quagga-2b500bb648942a90e53d774a68da31c52b9d14ac.tar.gz
vyatta-cfg-quagga-2b500bb648942a90e53d774a68da31c52b9d14ac.zip
Looks like merge with larkspur missed this...
Diffstat (limited to '.merge-branch-exclude')
0 files changed, 0 insertions, 0 deletions