65c14c1779
New methods: conflict.resolveUsingSource(cb) conflict.resolveUsingTarget(cb) conflict.resolveManually(data, cb) |
||
---|---|---|
.. | ||
models |
65c14c1779
New methods: conflict.resolveUsingSource(cb) conflict.resolveUsingTarget(cb) conflict.resolveManually(data, cb) |
||
---|---|---|
.. | ||
models |