<?xml version="1.0"?>
<?xml-stylesheet type="text/css" href="http://toolswiki.ouvaton.org/skins/common/feed.css?303"?>
<feed xmlns="http://www.w3.org/2005/Atom" xml:lang="en">
		<id>http://toolswiki.ouvaton.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://toolswiki.ouvaton.org/index.php?action=history&amp;feed=atom&amp;title=MediaWiki%3AExplainconflict"/>
		<link rel="alternate" type="text/html" href="http://toolswiki.ouvaton.org/index.php?title=MediaWiki:Explainconflict&amp;action=history"/>
		<updated>2026-04-21T15:04:16Z</updated>
		<subtitle>Revision history for this page on the wiki</subtitle>
		<generator>MediaWiki 1.22.0</generator>

	<entry>
		<id>http://toolswiki.ouvaton.org/index.php?title=MediaWiki:Explainconflict&amp;diff=503&amp;oldid=prev</id>
		<title>MediaWiki default at 19:43, 26 July 2007</title>
		<link rel="alternate" type="text/html" href="http://toolswiki.ouvaton.org/index.php?title=MediaWiki:Explainconflict&amp;diff=503&amp;oldid=prev"/>
				<updated>2007-07-26T19:43:13Z</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 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>MediaWiki default</name></author>	</entry>

	</feed>