Re: [Phpmyadmin-devel] Changes in upstream master for common functions

On Mon, Jul 2, 2012 at 5:58 PM, Marc Delisle <marc@infomarc.info> wrote:

Hi Atul and Thilina,

please watch for the recent changes that were merged to upstream master regarding the new PMA_CommonFunctions class.

You'll have to be extra careful with the code that exists only in your repo, when merging upstream master into your repo. Have a look at [0] to see what needs to be done to solve the conflicts.

[0]

https://github.com/phpmyadmin/phpmyadmin/commit/2d055c8190117cf962f6c43d4010...

Thanks Marc. -- Regards. Thilina Abeyrathna Gtalk : thilinaabeyrathna skype: thilinabuddika88 thilinaa.wordpress.com