[Systems] wiki-devel.sugarlabs.org/

[Sebastian Silva]

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.

One is glad to be of assistance.
Regards,
Sebastian

El jue, 22 de may 2014 a las 9:04 AM, Frederick Grose 
<fgrose at gmail.com> escribió:
> http://wiki-devel.sugarlabs.org/  only shows a blank page?
> 
>        --Fred
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.sugarlabs.org/private/systems/attachments/20140527/d0f3fd20/attachment.html>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: diff
Type: text/x-patch
Size: 5801 bytes
Desc: not available
URL: <http://lists.sugarlabs.org/private/systems/attachments/20140527/d0f3fd20/attachment.bin>