Add files to ignore on merge conflict if the 'ours' driver is configured
[taxeditor.git] / README.txt
1 For more information please see http://wp5.e-taxonomy.eu/taxeditor