diff options
| author | slioch <slioch@eng-140.vyatta.com> | 2009-06-05 16:43:14 -0700 |
|---|---|---|
| committer | slioch <slioch@eng-140.vyatta.com> | 2009-06-05 16:43:14 -0700 |
| commit | a83664f2b56df8aed5856d3ead4b67a50593fdbb (patch) | |
| tree | b0d6bd84bee2037af15a6872d0212d68125a9c3b /src/common/common.h | |
| parent | 73eb92353f4a105a258670d267a305f48e67ed5f (diff) | |
| download | vyatta-cfg-a83664f2b56df8aed5856d3ead4b67a50593fdbb.tar.gz vyatta-cfg-a83664f2b56df8aed5856d3ead4b67a50593fdbb.zip | |
fix for bug 4505 merge is now called merge.
Diffstat (limited to 'src/common/common.h')
0 files changed, 0 insertions, 0 deletions