#
# PyukiWiki Conflict file (English)
# "PyukiWiki" version 0.2.0-p2 $$
# $Id: conflict.en.txt,v 1.305 2012/03/01 08:42:03 papu Exp $
#
*On updating, a collision has occurred.
It seems that someone has already updated this page while you were editing it.
To the following...
Since there is a text which you edited,
Your contents of edit are not lost,
Please copy & paste to a notepad etc. immediately now.
Since copy & paste ends,
Contents newest by looking RecentChanges and please reedit again.
