jackie@b0rk@social.jvns.ca voted other -> I'd never heard of a merge conflict tool until your first poll. I haven't looked it up, but I'm not really sure what problem it would solve - I'd still have fix the conflict, right?
GNU social JP is a social network, courtesy of GNU social JP管理人. It runs on GNU social, version 2.0.2-dev, available under the GNU Affero General Public License.
All GNU social JP content and data are available under the Creative Commons Attribution 3.0 license.