http://wiki.hinnavaatlus.ee/index.php?action=history&feed=atom&title=MediaWiki%3AExplainconflict
MediaWiki:Explainconflict - Revision history
2026-05-18T22:58:52Z
Revision history for this page on the wiki
MediaWiki 1.35.13
http://wiki.hinnavaatlus.ee/index.php?title=MediaWiki:Explainconflict&diff=1942&oldid=prev
Madedog at 20. oktoober 2005, kell 18:15
2005-10-20T18:15:37Z
<p></p>
<table class="diff diff-contentalign-left diff-editfont-monospace" data-mw="interface">
<col class="diff-marker" />
<col class="diff-content" />
<col class="diff-marker" />
<col class="diff-content" />
<tr class="diff-title" lang="et">
<td colspan="2" style="background-color: #fff; color: #202122; text-align: center;">←Older revision</td>
<td colspan="2" style="background-color: #fff; color: #202122; text-align: center;">Redaktsioon: 20. oktoober 2005, kell 18:15</td>
</tr><tr><td colspan="2" class="diff-lineno" id="mw-diff-left-l1" >Rida 1:</td>
<td colspan="2" class="diff-lineno">Rida 1:</td></tr>
<tr><td class='diff-marker'>−</td><td style="color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #ffe49c; vertical-align: top; white-space: pre-wrap;"><div>Keegi teine on muutnud seda lehekülge pärast seda, kui Teie seda <del class="diffchange diffchange-inline">redigeerima </del>hakkasite.</div></td><td class='diff-marker'>+</td><td style="color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #a3d3ff; vertical-align: top; white-space: pre-wrap;"><div>Keegi teine on muutnud seda lehekülge pärast seda, kui Teie seda <ins class="diffchange diffchange-inline">toimetama </ins>hakkasite.</div></td></tr>
<tr><td class='diff-marker'> </td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>Ülemine toimetuskast sisaldab teksti viimast versiooni.</div></td><td class='diff-marker'> </td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>Ülemine toimetuskast sisaldab teksti viimast versiooni.</div></td></tr>
<tr><td class='diff-marker'> </td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>Teie muudatused on alumises kastis.</div></td><td class='diff-marker'> </td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>Teie muudatused on alumises kastis.</div></td></tr>
<tr><td class='diff-marker'> </td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>Teil tuleb need viimasesse versiooni üle viia.</div></td><td class='diff-marker'> </td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>Teil tuleb need viimasesse versiooni üle viia.</div></td></tr>
<tr><td class='diff-marker'> </td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>Kui Te klõpsate nupule</div></td><td class='diff-marker'> </td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>Kui Te klõpsate nupule</div></td></tr>
<tr><td class='diff-marker'>−</td><td style="color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #ffe49c; vertical-align: top; white-space: pre-wrap;"><div><del class="diffchange diffchange-inline"> </del>"Salvesta", siis salvestub <b>ainult</b> ülemises toimetuskastis olev tekst.<br /></div></td><td class='diff-marker'>+</td><td style="color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #a3d3ff; vertical-align: top; white-space: pre-wrap;"><div>"Salvesta", siis salvestub <b>ainult</b> ülemises toimetuskastis olev tekst.<br /></div></td></tr>
<!-- diff cache key wikibase-wiki_:diff::1.12:old-1453:rev-1942 -->
</table>
Madedog
http://wiki.hinnavaatlus.ee/index.php?title=MediaWiki:Explainconflict&diff=1453&oldid=prev
MediaWiki default at 16. oktoober 2005, kell 19:38
2005-10-16T19:38:56Z
<p></p>
<table class="diff diff-contentalign-left diff-editfont-monospace" data-mw="interface">
<col class="diff-marker" />
<col class="diff-content" />
<col class="diff-marker" />
<col class="diff-content" />
<tr class="diff-title" lang="et">
<td colspan="2" style="background-color: #fff; color: #202122; text-align: center;">←Older revision</td>
<td colspan="2" style="background-color: #fff; color: #202122; text-align: center;">Redaktsioon: 16. oktoober 2005, kell 19:38</td>
</tr><tr><td colspan="2" class="diff-lineno" id="mw-diff-left-l4" >Rida 4:</td>
<td colspan="2" class="diff-lineno">Rida 4:</td></tr>
<tr><td class='diff-marker'> </td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>Teil tuleb need viimasesse versiooni üle viia.</div></td><td class='diff-marker'> </td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>Teil tuleb need viimasesse versiooni üle viia.</div></td></tr>
<tr><td class='diff-marker'> </td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>Kui Te klõpsate nupule</div></td><td class='diff-marker'> </td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>Kui Te klõpsate nupule</div></td></tr>
<tr><td class='diff-marker'>−</td><td style="color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #ffe49c; vertical-align: top; white-space: pre-wrap;"><div> "Salvesta", siis salvestub <b>ainult</b> ülemises toimetuskastis olev tekst.</div></td><td class='diff-marker'>+</td><td style="color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #a3d3ff; vertical-align: top; white-space: pre-wrap;"><div> "Salvesta", siis salvestub <b>ainult</b> ülemises toimetuskastis olev tekst.<<ins class="diffchange diffchange-inline">br /</ins>></div></td></tr>
<tr><td class='diff-marker'>−</td><td style="color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #ffe49c; vertical-align: top; white-space: pre-wrap;"><div><<del class="diffchange diffchange-inline">p</del>></div></td><td colspan="2"> </td></tr>
<!-- diff cache key wikibase-wiki_:diff::1.12:old-341:rev-1453 -->
</table>
MediaWiki default
http://wiki.hinnavaatlus.ee/index.php?title=MediaWiki:Explainconflict&diff=341&oldid=prev
MediaWiki default at 29. september 2005, kell 14:30
2005-09-29T14:30:15Z
<p></p>
<p><b>Uus artikkel</b></p><div>Keegi teine on muutnud seda lehekülge pärast seda, kui Teie seda redigeerima hakkasite.<br />
Ülemine toimetuskast sisaldab teksti viimast versiooni.<br />
Teie muudatused on alumises kastis.<br />
Teil tuleb need viimasesse versiooni üle viia.<br />
Kui Te klõpsate nupule<br />
"Salvesta", siis salvestub <b>ainult</b> ülemises toimetuskastis olev tekst.<br />
<p></div>
MediaWiki default