annotate conflict-editor/src/test/resources/no-conflicts.json @ 16:47f6cbd38de3

clean code!
author dirk
date Sat, 17 Sep 2011 06:49:13 +0200
parents 6f11757c4811
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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":[]}