Add conflict resolver
[disclosr.git] / javascripts / sigma
1