summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2012-12-05 07:06:29 -0600
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2012-12-05 07:06:29 -0600
commit4dcd236efc95718475615da9d054e3e3ed7f128c (patch)
tree7f6f22a0717ee322a528122d274a4d74af12882e /doc
parentf5c2e1f64b90b59716c835c10b0ffef510eb33df (diff)
downloadbcfg2-4dcd236efc95718475615da9d054e3e3ed7f128c.tar.gz
bcfg2-4dcd236efc95718475615da9d054e3e3ed7f128c.tar.bz2
bcfg2-4dcd236efc95718475615da9d054e3e3ed7f128c.zip
Svn: fixed conflict resolution callback, log level
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions