Mercurial > hg > ConflictEditor
view conflict-editor/src/test/resources/single-conflict.json @ 0:6f11757c4811
first drop of the conflict editor - mostly model work
author | Dirk Olmes <dirk@xanthippe.ping.de> |
---|---|
date | Mon, 12 Sep 2011 11:47:48 +0200 |
parents | |
children |
line wrap: on
line source
{ "total_rows": 24, "offset": 0, "rows": [ { "id": "54620eb9a46d495eac294a3bd508db39", "key": { "_id": "54620eb9a46d495eac294a3bd508db39", "_rev": "24-223d00d8f77d78a2911cbb265f5025eb", "rss_url": "http://feeds.feedburner.com/muleblog\n", "always_open_in_browser": false, "auto_load_entry_link": false, "title": "From the Mule\u2019s Mouth", "doctype": "feed", "update_interval": 60, "next_update": "2011-09-12T03:20:06Z", "_conflicts": [ "16-7f27b886bf38e4f9e543bee0ddf85758" ] }, "value": [ "16-7f27b886bf38e4f9e543bee0ddf85758" ] } ] }