<?xml version="1.0"?>
<feed xmlns="http://www.w3.org/2005/Atom" xml:lang="en">
	<id>http://wiki.linuxmce.org/index.php?action=history&amp;feed=atom&amp;title=MediaWiki%3AExplainconflict</id>
	<title>MediaWiki:Explainconflict - Revision history</title>
	<link rel="self" type="application/atom+xml" href="http://wiki.linuxmce.org/index.php?action=history&amp;feed=atom&amp;title=MediaWiki%3AExplainconflict"/>
	<link rel="alternate" type="text/html" href="http://wiki.linuxmce.org/index.php?title=MediaWiki:Explainconflict&amp;action=history"/>
	<updated>2026-10-28T22:18:28Z</updated>
	<subtitle>Revision history for this page on the wiki</subtitle>
	<generator>MediaWiki 1.44.0</generator>
	<entry>
		<id>http://wiki.linuxmce.org/index.php?title=MediaWiki:Explainconflict&amp;diff=479&amp;oldid=prev</id>
		<title>Wikiadmin at 12:21, 20 February 2006</title>
		<link rel="alternate" type="text/html" href="http://wiki.linuxmce.org/index.php?title=MediaWiki:Explainconflict&amp;diff=479&amp;oldid=prev"/>
		<updated>2006-02-20T12:21:36Z</updated>

		<summary type="html">&lt;p&gt;&lt;/p&gt;
&lt;p&gt;&lt;b&gt;New page&lt;/b&gt;&lt;/p&gt;&lt;div&gt;Someone else has changed this page since you&lt;br /&gt;
started editing it.&lt;br /&gt;
The upper text area contains the page text as it currently exists.&lt;br /&gt;
Your changes are shown in the lower text area.&lt;br /&gt;
You will have to merge your changes into the existing text.&lt;br /&gt;
&amp;lt;b&amp;gt;Only&amp;lt;/b&amp;gt; the text in the upper text area will be saved when you&lt;br /&gt;
press &amp;quot;Save page&amp;quot;.&amp;lt;br /&amp;gt;&lt;/div&gt;</summary>
		<author><name>Wikiadmin</name></author>
	</entry>
</feed>