[Systems] wiki-devel.sugarlabs.org/

Bernie Innocenti bernie at codewiz.org
Tue May 27 02:23:59 EDT 2014

On 05/27/2014 01:51 AM, Sebastian Silva wrote:
> Hi,
> I had hoped to look at this sooner, sorry for the delay.
> Looks like somebody applied a patch to the wiki-devel instance, and did
> not finish manually merging some conflicting lines:
> icarito at sunjammer:/srv/www-sugarlabs/wiki-devel$ grep "<<<<<<" */*.php -Rn
> includes/Article.php:59:<<<<<<< HEAD
> includes/Article.php:746:<<<<<<< HEAD
> includes/EditPage.php:2613:<<<<<<< HEAD
> includes/EditPage.php:2632:<<<<<<< HEAD
> includes/Revision.php:1231:<<<<<<< HEAD 
> I've attached the full diff.
> I resolved the confict manually, picking the version from upstream. But
> it starting showing issues so finally I aborted the conflict resolution
> and stashed the merge.
> This produced a working wiki-devel.

Thank you for fixing it, Sebastian! I might be the bad sysadmin who left
the devel wiki in this sad state some time ago... I don't really remember.

> One is glad to be of assistance.

Oh, I know this quote! Isn't it from The Bicentennial Man?

 _ // Bernie Innocenti
 \X/  http://codewiz.org

More information about the Systems mailing list