Just return the array of conflicts

2016-10-12 23:18:35 +03:00 · 2016-10-12 23:18:35 +03:00 · 42582f79b3
parent 9d305834e3
commit 42582f79b3
1 changed files with 1 additions and 1 deletions
--- a/app/views/conflicts/show.json.jbuilder
+++ b/app/views/conflicts/show.json.jbuilder
@ -1 +1 @@
-json.extract! @conflicts_table, :talk_id, :conflicts
+json.merge! @conflicts_table.conflicts
`@ -1 +1 @@`
	`json.extract! @conflicts_table, :talk_id, :conflicts`	`json.merge! @conflicts_table.conflicts`