tree 7e3f481c762cfa3ecf83eee64dd255ab7eb758aa
parent 79724f521273a918467dfa7cfa025dfe4b38b962
author Jatin Lodhia <jlodhia@google.com> 1440784334 -0700
committer Jatin Lodhia <jlodhia@google.com> 1440784334 -0700

Add Conflict resolution API
1) Client side API for receiving Conflicts
2) Model objects for Conflict and Resolution data
3) RPC API to register conflict resolver with syncbase service
4) Example conflict resolver along with tests to verify it

Change-Id: I671bcadd30b12c0388664ff7c8d315079eae7ddb