Conflicts:
	.travis.yml

Conflicts:
	.travis.yml
	dev/codesniffer/ruleset.xml
	htdocs/core/class/conf.class.php
	htdocs/langs/en_US/productbatch.lang

Conflicts:
	htdocs/core/class/conf.class.php
	htdocs/langs/en_US/productbatch.lang

Conflicts:
	build/debian/changelog
	htdocs/core/tpl/objectline_create.tpl.php

Conflicts:
	build/debian/changelog
	build/exe/doliwamp/doliwamp.iss
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/filefunc.inc.php

Conflicts:
	htdocs/projet/tasks/task.php

for release.

a limit to avoid problem with very large database.