fix mg fail

author yasushiito <yas@pen-chan.jp>

Wed, 21 Jan 2015 05:44:03 +0000 (14:44 +0900)

committer yasushiito <yas@pen-chan.jp>

Wed, 21 Jan 2015 05:44:03 +0000 (14:44 +0900)
author yasushiito <yas@pen-chan.jp>
Wed, 21 Jan 2015 05:44:03 +0000 (14:44 +0900)
committer yasushiito <yas@pen-chan.jp>
Wed, 21 Jan 2015 05:44:03 +0000 (14:44 +0900)
diff --cc app/assets/javascripts/editor/panel_editor.js.coffee
Simple merge
diff --cc app/assets/javascripts/editor/panel_editor/dock.js.coffee
Simple merge
author	yasushiito <yas@pen-chan.jp>
	Wed, 21 Jan 2015 05:44:03 +0000 (14:44 +0900)
committer	yasushiito <yas@pen-chan.jp>
	Wed, 21 Jan 2015 05:44:03 +0000 (14:44 +0900)
		1	2
app/assets/javascripts/editor/panel_editor.js.coffee	patch \|	diff1 \|	diff2 \|	blob \| history
app/assets/javascripts/editor/panel_editor/dock.js.coffee	patch \|	diff1 \|	diff2 \|	blob \| history