Justin Edmund
559507977b
* Conflict is detected when attempting to save a new GridCharacter * New `resolve` method executes the replacement * Template to render a decision on the frontend
14 lines
No EOL
233 B
Ruby
14 lines
No EOL
233 B
Ruby
object false
|
|
|
|
node :conflicts do
|
|
partial('grid_characters/base', :object => @conflict_characters)
|
|
end
|
|
|
|
node :incoming do
|
|
partial('characters/base', :object => @incoming_character)
|
|
end
|
|
|
|
node :position do
|
|
@incoming_position
|
|
end
|
|
|