Meik Sievertsen d1f796bf25 phpBB updater now solves common conflicts on it's own. This further reduces the chance of conflicts. ...

(tested with some heavily modified files who previously generated a lot of conflicts)

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10160 89ea8834-ac86-4346-8a33-228a782c2dd0

2009-09-17 14:18:57 +00:00

..

diff.php

phpBB updater now solves common conflicts on it's own. This further reduces the chance of conflicts.

2009-09-17 14:18:57 +00:00

engine.php

…

renderer.php

…