git ssb - fix merge bugs · Piet/ssb-loomio@d73dadc0

mix irving committed on 3/9/2018, 5:19:13 AM
Parent: 3bda266a27314cf10feec6e7837763e99de0bb22

changed

poll/async/get.jsView
		@@ -44,9 +44,9 @@
44	44 …	author,
45	45 …	content: {
46	46 …	title,
47	47 …	body,
48		- pollDetails: { type }
	48 …	+ details: { type }
49	49 …	}
50	50 …	} = rawPoll.value
WritePreview
51	51 …
52	52 …	const poll = Object.assign({}, rawPoll, {

Piet / ssb-loomio