https://zoophilia.wiki/index.php?action=history&feed=atom&title=Template%3AEdit_conflict 2026-05-07T14:06:57Z Revision history for this page on the wiki MediaWiki 1.44.0 https://zoophilia.wiki/index.php?title=Template:Edit_conflict&diff=105289&oldid=prev 2020-09-03T16:22:30Z

<p>13 revisions imported</p> <table style="background-color: #fff; color: #202122;" data-mw="interface"> <tr class="diff-title" lang="en"> <td colspan="1" style="background-color: #fff; color: #202122; text-align: center;">← Older revision</td> <td colspan="1" style="background-color: #fff; color: #202122; text-align: center;">Revision as of 16:22, 3 September 2020</td> </tr><tr><td colspan="2" class="diff-notice" lang="en"><div class="mw-diff-empty">(No difference)</div> </td></tr></table>

Ookami https://zoophilia.wiki/index.php?title=Template:Edit_conflict&diff=105288&oldid=prev 2013-11-11T16:56:33Z

<p>Changed protection level of Template:Edit conflict: Allowing Protected Template editors ([Edit=Allow only template editors and admins] (indefinite) [Move=Allow only template editors and admins] (indefinite))</p> <table style="background-color: #fff; color: #202122;" data-mw="interface"> <tr class="diff-title" lang="en"> <td colspan="1" style="background-color: #fff; color: #202122; text-align: center;">← Older revision</td> <td colspan="1" style="background-color: #fff; color: #202122; text-align: center;">Revision as of 16:56, 11 November 2013</td> </tr><tr><td colspan="2" class="diff-notice" lang="en"><div class="mw-diff-empty">(No difference)</div> </td></tr></table>

meta>Mark Arsten https://zoophilia.wiki/index.php?title=Template:Edit_conflict&diff=105287&oldid=prev 2010-04-20T10:17:56Z

<p>wow, correcting blatant error on my part</p> <table style="background-color: #fff; color: #202122;" data-mw="interface"> <col class="diff-marker" /> <col class="diff-content" /> <col class="diff-marker" /> <col class="diff-content" /> <tr class="diff-title" lang="en"> <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;">Revision as of 10:17, 20 April 2010</td> </tr><tr><td colspan="2" class="diff-lineno" id="mw-diff-left-l1">Line 1:</td> <td colspan="2" class="diff-lineno">Line 1:</td></tr> <tr><td class="diff-marker" data-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>&lt;small&gt;([[Help:Edit conflict|edit conflict]]{{&lt;includeonly&gt;safesubst:&lt;/includeonly&gt;#if:{{{1|}}}|&amp;#32;× {{{1}}}}})&lt;/small&gt;noinclude&gt;</div></td><td class="diff-marker" data-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>&lt;small&gt;([[Help:Edit conflict|edit conflict]]{{&lt;includeonly&gt;safesubst:&lt;/includeonly&gt;#if:{{{1|}}}|&amp;#32;× {{{1}}}}})&lt;/small&gt;<ins style="font-weight: bold; text-decoration: none;">&lt;</ins>noinclude&gt;</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>{{documentation}}</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>{{documentation}}</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>&lt;/noinclude&gt;</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>&lt;/noinclude&gt;</div></td></tr> </table>

meta>CapitalR https://zoophilia.wiki/index.php?title=Template:Edit_conflict&diff=105286&oldid=prev 2010-04-20T10:17:06Z

<p>adding safesubst per request to simplify code when substituted</p> <table style="background-color: #fff; color: #202122;" data-mw="interface"> <col class="diff-marker" /> <col class="diff-content" /> <col class="diff-marker" /> <col class="diff-content" /> <tr class="diff-title" lang="en"> <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;">Revision as of 10:17, 20 April 2010</td> </tr><tr><td colspan="2" class="diff-lineno" id="mw-diff-left-l1">Line 1:</td> <td colspan="2" class="diff-lineno">Line 1:</td></tr> <tr><td class="diff-marker" data-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>&lt;small&gt;([[Help:Edit conflict|edit conflict]]{{#if:{{{1|}}}|&amp;#32;× {{{1}}}}})&lt;/small&gt;<del style="font-weight: bold; text-decoration: none;">&lt;</del>noinclude&gt;</div></td><td class="diff-marker" data-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>&lt;small&gt;([[Help:Edit conflict|edit conflict]]{{<ins style="font-weight: bold; text-decoration: none;">&lt;includeonly&gt;safesubst:&lt;/includeonly&gt;</ins>#if:{{{1|}}}|&amp;#32;× {{{1}}}}})&lt;/small&gt;noinclude&gt;</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>{{documentation}}</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>{{documentation}}</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>&lt;/noinclude&gt;</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>&lt;/noinclude&gt;</div></td></tr> </table>

meta>CapitalR https://zoophilia.wiki/index.php?title=Template:Edit_conflict&diff=105285&oldid=prev 2009-11-03T23:28:04Z

<p>use × instead of x</p> <table style="background-color: #fff; color: #202122;" data-mw="interface"> <col class="diff-marker" /> <col class="diff-content" /> <col class="diff-marker" /> <col class="diff-content" /> <tr class="diff-title" lang="en"> <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;">Revision as of 23:28, 3 November 2009</td> </tr><tr><td colspan="2" class="diff-lineno" id="mw-diff-left-l1">Line 1:</td> <td colspan="2" class="diff-lineno">Line 1:</td></tr> <tr><td class="diff-marker" data-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>&lt;small&gt;([[Help:Edit conflict|edit conflict]]{{#if:{{{1|}}}|&amp;#32;<del style="font-weight: bold; text-decoration: none;">x </del>{{{1}}}}})&lt;/small&gt;&lt;noinclude&gt;</div></td><td class="diff-marker" data-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>&lt;small&gt;([[Help:Edit conflict|edit conflict]]{{#if:{{{1|}}}|&amp;#32;<ins style="font-weight: bold; text-decoration: none;">× </ins>{{{1}}}}})&lt;/small&gt;&lt;noinclude&gt;</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>{{documentation}}</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>{{documentation}}</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>&lt;/noinclude&gt;</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>&lt;/noinclude&gt;</div></td></tr> </table>

meta>Andrwsc https://zoophilia.wiki/index.php?title=Template:Edit_conflict&diff=105284&oldid=prev 2009-10-23T12:11:13Z

<p>moved <a href="/index.php?title=Template:Ec" class="mw-redirect" title="Template:Ec">Template:Ec</a> to <a href="/index.php?title=Template:Edit_conflict" title="Template:Edit conflict">Template:Edit conflict</a>: more descriptive name, abbreviation will remain as redirect</p> <table style="background-color: #fff; color: #202122;" data-mw="interface"> <tr class="diff-title" lang="en"> <td colspan="1" style="background-color: #fff; color: #202122; text-align: center;">← Older revision</td> <td colspan="1" style="background-color: #fff; color: #202122; text-align: center;">Revision as of 12:11, 23 October 2009</td> </tr><tr><td colspan="2" class="diff-notice" lang="en"><div class="mw-diff-empty">(No difference)</div> </td></tr></table>

meta>MSGJ https://zoophilia.wiki/index.php?title=Template:Edit_conflict&diff=105283&oldid=prev 2009-10-23T12:09:34Z

<p>add doc page</p> <table style="background-color: #fff; color: #202122;" data-mw="interface"> <col class="diff-marker" /> <col class="diff-content" /> <col class="diff-marker" /> <col class="diff-content" /> <tr class="diff-title" lang="en"> <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;">Revision as of 12:09, 23 October 2009</td> </tr><tr><td colspan="2" class="diff-lineno" id="mw-diff-left-l1">Line 1:</td> <td colspan="2" class="diff-lineno">Line 1:</td></tr> <tr><td class="diff-marker" data-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>&lt;small&gt;([[Help:Edit conflict|edit conflict]]{{#if:{{{1|}}}|&amp;#32;x {{{1}}}}})&lt;/small&gt;</div></td><td class="diff-marker" data-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>&lt;small&gt;([[Help:Edit conflict|edit conflict]]{{#if:{{{1|}}}|&amp;#32;x {{{1}}}}})&lt;/small<ins style="font-weight: bold; text-decoration: none;">&gt;&lt;noinclude&gt;</ins></div></td></tr> <tr><td colspan="2" class="diff-side-deleted"></td><td class="diff-marker" data-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><ins style="font-weight: bold; text-decoration: none;">{{documentation}}</ins></div></td></tr> <tr><td colspan="2" class="diff-side-deleted"></td><td class="diff-marker" data-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><ins style="font-weight: bold; text-decoration: none;">&lt;/noinclude</ins>&gt;</div></td></tr> </table>

meta>MSGJ https://zoophilia.wiki/index.php?title=Template:Edit_conflict&diff=105282&oldid=prev 2009-10-23T12:08:21Z

<p>allow number of conflicts to be stated, per request</p> <table style="background-color: #fff; color: #202122;" data-mw="interface"> <col class="diff-marker" /> <col class="diff-content" /> <col class="diff-marker" /> <col class="diff-content" /> <tr class="diff-title" lang="en"> <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;">Revision as of 12:08, 23 October 2009</td> </tr><tr><td colspan="2" class="diff-lineno" id="mw-diff-left-l1">Line 1:</td> <td colspan="2" class="diff-lineno">Line 1:</td></tr> <tr><td class="diff-marker" data-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>&lt;small&gt;([[Help:Edit conflict|edit conflict]])&lt;/small&gt;</div></td><td class="diff-marker" data-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>&lt;small&gt;([[Help:Edit conflict|edit conflict]]<ins style="font-weight: bold; text-decoration: none;">{{#if:{{{1|}}}|&amp;#32;x {{{1}}}}}</ins>)&lt;/small&gt;</div></td></tr> </table>

meta>MSGJ https://zoophilia.wiki/index.php?title=Template:Edit_conflict&diff=105281&oldid=prev 2008-04-29T04:48:23Z

<p>Protected Template:Ec: Full protect, just to be safe. [edit=sysop:move=sysop]</p> <table style="background-color: #fff; color: #202122;" data-mw="interface"> <tr class="diff-title" lang="en"> <td colspan="1" style="background-color: #fff; color: #202122; text-align: center;">← Older revision</td> <td colspan="1" style="background-color: #fff; color: #202122; text-align: center;">Revision as of 04:48, 29 April 2008</td> </tr><tr><td colspan="2" class="diff-notice" lang="en"><div class="mw-diff-empty">(No difference)</div> </td></tr></table>

meta>Ral315 https://zoophilia.wiki/index.php?title=Template:Edit_conflict&diff=105280&oldid=prev 2008-01-29T19:26:33Z

<p>being bold... i keep getting asked &quot;what&#039;s an edit conflict?&quot; revert if anyone dislikes the link!</p> <table style="background-color: #fff; color: #202122;" data-mw="interface"> <col class="diff-marker" /> <col class="diff-content" /> <col class="diff-marker" /> <col class="diff-content" /> <tr class="diff-title" lang="en"> <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;">Revision as of 19:26, 29 January 2008</td> </tr><tr><td colspan="2" class="diff-lineno" id="mw-diff-left-l1">Line 1:</td> <td colspan="2" class="diff-lineno">Line 1:</td></tr> <tr><td class="diff-marker" data-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>&lt;small <del style="font-weight: bold; text-decoration: none;">style="color: gray"</del>&gt;(edit conflict<del style="font-weight: bold; text-decoration: none;">{{#ifeq:{{{1|1}}}|1||&amp;#32;x{{{1|}}}}}</del>)&lt;/small&gt;</div></td><td class="diff-marker" data-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>&lt;small&gt;(<ins style="font-weight: bold; text-decoration: none;">[[Help:Edit conflict|</ins>edit conflict<ins style="font-weight: bold; text-decoration: none;">]]</ins>)&lt;/small&gt;</div></td></tr> </table>

meta>Hmwith