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

	<entry>
		<id>https://wiki.openmod-initiative.org/index.php?title=MediaWiki:Explainconflict&amp;diff=63&amp;oldid=prev</id>
		<title>Uschuetzenmeister at 19:59, 18 February 2011</title>
		<link rel="alternate" type="text/html" href="https://wiki.openmod-initiative.org/index.php?title=MediaWiki:Explainconflict&amp;diff=63&amp;oldid=prev"/>
				<updated>2011-02-18T19:59:22Z</updated>
		
		<summary type="html">&lt;p&gt;&lt;/p&gt;
&lt;table class='diff diff-contentalign-left'&gt;
				&lt;col class='diff-marker' /&gt;
				&lt;col class='diff-content' /&gt;
				&lt;col class='diff-marker' /&gt;
				&lt;col class='diff-content' /&gt;
			&lt;tr valign='top'&gt;
			&lt;td colspan='2' style=&quot;background-color: white; color:black;&quot;&gt;← Older revision&lt;/td&gt;
			&lt;td colspan='2' style=&quot;background-color: white; color:black;&quot;&gt;Revision as of 19:59, 18 February 2011&lt;/td&gt;
			&lt;/tr&gt;&lt;tr&gt;&lt;td colspan=&quot;2&quot; class=&quot;diff-lineno&quot;&gt;Line 1:&lt;/td&gt;
&lt;td colspan=&quot;2&quot; class=&quot;diff-lineno&quot;&gt;Line 1:&lt;/td&gt;&lt;/tr&gt;
&lt;tr&gt;&lt;td class='diff-marker'&gt;−&lt;/td&gt;&lt;td style=&quot;background: #ffa; color:black; font-size: smaller;&quot;&gt;&lt;div&gt;&amp;lt;div class=&amp;quot;warning&amp;quot;&amp;gt;'''WARNING: Someone else has changed this page since you started editing it.''' The '''upper text area''' contains the page text as it currently exists. '''Your changes are shown in the lower text area'''. You will have to merge your changes into the existing text. '''Only the text in the upper text area will be saved when you press &amp;quot;Save page&amp;quot;.'''&amp;lt;/div&amp;gt;&lt;/div&gt;&lt;/td&gt;&lt;td class='diff-marker'&gt;+&lt;/td&gt;&lt;td style=&quot;background: #cfc; color:black; font-size: smaller;&quot;&gt;&lt;div&gt;&amp;lt;div class=&amp;quot;warning&amp;quot;&amp;gt;'''WARNING: Someone else has changed this page since you started editing it.'''&lt;/div&gt;&lt;/td&gt;&lt;/tr&gt;
&lt;tr&gt;&lt;td colspan=&quot;2&quot;&gt;&amp;#160;&lt;/td&gt;&lt;td class='diff-marker'&gt;+&lt;/td&gt;&lt;td style=&quot;background: #cfc; color:black; font-size: smaller;&quot;&gt;&lt;div&gt;The '''upper text area''' contains the page text as it currently exists.&lt;/div&gt;&lt;/td&gt;&lt;/tr&gt;
&lt;tr&gt;&lt;td colspan=&quot;2&quot;&gt;&amp;#160;&lt;/td&gt;&lt;td class='diff-marker'&gt;+&lt;/td&gt;&lt;td style=&quot;background: #cfc; color:black; font-size: smaller;&quot;&gt;&lt;div&gt;'''Your changes are shown in the lower text area'''.&lt;/div&gt;&lt;/td&gt;&lt;/tr&gt;
&lt;tr&gt;&lt;td colspan=&quot;2&quot;&gt;&amp;#160;&lt;/td&gt;&lt;td class='diff-marker'&gt;+&lt;/td&gt;&lt;td style=&quot;background: #cfc; color:black; font-size: smaller;&quot;&gt;&lt;div&gt;You will have to merge your changes into the existing text.&lt;/div&gt;&lt;/td&gt;&lt;/tr&gt;
&lt;tr&gt;&lt;td colspan=&quot;2&quot;&gt;&amp;#160;&lt;/td&gt;&lt;td class='diff-marker'&gt;+&lt;/td&gt;&lt;td style=&quot;background: #cfc; color:black; font-size: smaller;&quot;&gt;&lt;div&gt;'''Only the text in the upper text area will be saved when you press &amp;quot;Save page&amp;quot;.'''&amp;lt;/div&amp;gt;&lt;/div&gt;&lt;/td&gt;&lt;/tr&gt;
&lt;/table&gt;</summary>
		<author><name>Uschuetzenmeister</name></author>	</entry>

	<entry>
		<id>https://wiki.openmod-initiative.org/index.php?title=MediaWiki:Explainconflict&amp;diff=62&amp;oldid=prev</id>
		<title>Uschuetzenmeister: Created page with &quot;&lt;div class=&quot;warning&quot;&gt;'''WARNING: Someone else has changed this page since you started editing it.''' The '''upper text area''' contains the page text as it currently exists. '''Y...&quot;</title>
		<link rel="alternate" type="text/html" href="https://wiki.openmod-initiative.org/index.php?title=MediaWiki:Explainconflict&amp;diff=62&amp;oldid=prev"/>
				<updated>2011-02-18T19:58:43Z</updated>
		
		<summary type="html">&lt;p&gt;Created page with &amp;quot;&amp;lt;div class=&amp;quot;warning&amp;quot;&amp;gt;&amp;#039;&amp;#039;&amp;#039;WARNING: Someone else has changed this page since you started editing it.&amp;#039;&amp;#039;&amp;#039; The &amp;#039;&amp;#039;&amp;#039;upper text area&amp;#039;&amp;#039;&amp;#039; contains the page text as it currently exists. &amp;#039;&amp;#039;&amp;#039;Y...&amp;quot;&lt;/p&gt;
&lt;p&gt;&lt;b&gt;New page&lt;/b&gt;&lt;/p&gt;&lt;div&gt;&amp;lt;div class=&amp;quot;warning&amp;quot;&amp;gt;'''WARNING: Someone else has changed this page since you started editing it.''' The '''upper text area''' contains the page text as it currently exists. '''Your changes are shown in the lower text area'''. You will have to merge your changes into the existing text. '''Only the text in the upper text area will be saved when you press &amp;quot;Save page&amp;quot;.'''&amp;lt;/div&amp;gt;&lt;/div&gt;</summary>
		<author><name>Uschuetzenmeister</name></author>	</entry>

	</feed>