diff options
| author | Jason Kincl <kincljc@ornl.gov> | 2012-11-07 14:42:10 -0500 |
|---|---|---|
| committer | Jason Kincl <kincljc@ornl.gov> | 2012-11-07 14:42:10 -0500 |
| commit | 16359ae0f40b80c5ddc5bf495d3c1081bf5b81b3 (patch) | |
| tree | c5b7c5b698b3731e68aecc552552132c3b68761a /src/lib/Bcfg2/Server/Admin/Snapshots.py | |
| parent | db60e20ca7a328509da99862a1634639dd45cf5d (diff) | |
| download | bcfg2-16359ae0f40b80c5ddc5bf495d3c1081bf5b81b3.tar.gz bcfg2-16359ae0f40b80c5ddc5bf495d3c1081bf5b81b3.tar.bz2 bcfg2-16359ae0f40b80c5ddc5bf495d3c1081bf5b81b3.zip | |
Adding a default conflict resolver of theirs-full to Svn Plugin
Diffstat (limited to 'src/lib/Bcfg2/Server/Admin/Snapshots.py')
0 files changed, 0 insertions, 0 deletions