resolving svn conflicts
[infodrom/rico3] / php_logo.jpg
php_logo.jpg