Force the version.php file in the _DEV branch to be accepted without merge conflicts

Because we alter this file via release.php script git finds a merge conflict.

Merge request reports

Loading