Mercurial > hg > ConflictEditor
annotate conflict-editor/src/test/resources/no-conflicts.json @ 34:4ccf7e7f03b0
replace the text field for the db url with a combo box that is populated from the preferences.
author | dirk |
---|---|
date | Fri, 07 Oct 2011 03:58:41 +0200 |
parents | 6f11757c4811 |
children |
rev | line source |
---|---|
0
6f11757c4811
first drop of the conflict editor - mostly model work
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff
changeset
|
1 { "total_rows":0, "offset":0, "rows":[]} |