<?xml version="1.0"?>
<feed xmlns="http://www.w3.org/2005/Atom" xml:lang="en">
	<id>https://wiki.eotir.com/index.php?action=history&amp;feed=atom&amp;title=Template%3AConflict2</id>
	<title>Template:Conflict2 - Revision history</title>
	<link rel="self" type="application/atom+xml" href="https://wiki.eotir.com/index.php?action=history&amp;feed=atom&amp;title=Template%3AConflict2"/>
	<link rel="alternate" type="text/html" href="https://wiki.eotir.com/index.php?title=Template:Conflict2&amp;action=history"/>
	<updated>2026-05-08T23:36:52Z</updated>
	<subtitle>Revision history for this page on the wiki</subtitle>
	<generator>MediaWiki 1.45.3</generator>
	<entry>
		<id>https://wiki.eotir.com/index.php?title=Template:Conflict2&amp;diff=225&amp;oldid=prev</id>
		<title>Ryan: Created page with &quot;&lt;br /&gt; &lt;br /&gt; {| width=&quot;100%&quot; style=&quot;border: 1px solid grey; padding: 1px; margin: 5px; font-size: 11px;&quot; | colspan=&quot;2&quot; style=&quot;background-color: #000099; font-size: 14px; text-align: center; color: white;&quot; | &#039;&#039;&#039;{{{conflict}}}&#039;&#039;&#039; |- | colspan=&quot;2&quot; style=&quot;background-color: #000066; text-align: center; color: white;&quot; | {{{image}}} |- | colspan=&quot;2&quot; style=&quot;background-color: #000099; text-align: center; color: white;&quot; | &#039;&#039;&#039;Factions&#039;&#039;&#039; |- | width=&quot;20%&quot; style=&quot;background-color: #...&quot;</title>
		<link rel="alternate" type="text/html" href="https://wiki.eotir.com/index.php?title=Template:Conflict2&amp;diff=225&amp;oldid=prev"/>
		<updated>2025-04-01T19:08:51Z</updated>

		<summary type="html">&lt;p&gt;Created page with &amp;quot;&amp;lt;br /&amp;gt; &amp;lt;br /&amp;gt; {| width=&amp;quot;100%&amp;quot; style=&amp;quot;border: 1px solid grey; padding: 1px; margin: 5px; font-size: 11px;&amp;quot; | colspan=&amp;quot;2&amp;quot; style=&amp;quot;background-color: #000099; font-size: 14px; text-align: center; color: white;&amp;quot; | &amp;#039;&amp;#039;&amp;#039;{{{conflict}}}&amp;#039;&amp;#039;&amp;#039; |- | colspan=&amp;quot;2&amp;quot; style=&amp;quot;background-color: #000066; text-align: center; color: white;&amp;quot; | {{{image}}} |- | colspan=&amp;quot;2&amp;quot; style=&amp;quot;background-color: #000099; text-align: center; color: white;&amp;quot; | &amp;#039;&amp;#039;&amp;#039;Factions&amp;#039;&amp;#039;&amp;#039; |- | width=&amp;quot;20%&amp;quot; style=&amp;quot;background-color: #...&amp;quot;&lt;/p&gt;
&lt;p&gt;&lt;b&gt;New page&lt;/b&gt;&lt;/p&gt;&lt;div&gt;&amp;lt;br /&amp;gt;&lt;br /&gt;
&amp;lt;br /&amp;gt;&lt;br /&gt;
{| width=&amp;quot;100%&amp;quot; style=&amp;quot;border: 1px solid grey; padding: 1px; margin: 5px; font-size: 11px;&amp;quot;&lt;br /&gt;
| colspan=&amp;quot;2&amp;quot; style=&amp;quot;background-color: #000099; font-size: 14px; text-align: center; color: white;&amp;quot; | &amp;#039;&amp;#039;&amp;#039;{{{conflict}}}&amp;#039;&amp;#039;&amp;#039;&lt;br /&gt;
|-&lt;br /&gt;
| colspan=&amp;quot;2&amp;quot; style=&amp;quot;background-color: #000066; text-align: center; color: white;&amp;quot; | {{{image}}}&lt;br /&gt;
|-&lt;br /&gt;
| colspan=&amp;quot;2&amp;quot; style=&amp;quot;background-color: #000099; text-align: center; color: white;&amp;quot; | &amp;#039;&amp;#039;&amp;#039;Factions&amp;#039;&amp;#039;&amp;#039;&lt;br /&gt;
|-&lt;br /&gt;
| width=&amp;quot;20%&amp;quot; style=&amp;quot;background-color: #000066;&amp;quot; | Side 1&lt;br /&gt;
| width=&amp;quot;80%&amp;quot; | {{{side1}}}&lt;br /&gt;
|-&lt;br /&gt;
| width=&amp;quot;20%&amp;quot; style=&amp;quot;background-color: #000066;&amp;quot; | Side 2&lt;br /&gt;
| width=&amp;quot;80%&amp;quot; | {{{side2}}}&lt;br /&gt;
|-&lt;br /&gt;
| width=&amp;quot;20%&amp;quot; style=&amp;quot;background-color: #000066;&amp;quot; | Other&lt;br /&gt;
| width=&amp;quot;80%&amp;quot; | {{{other}}}&lt;br /&gt;
|-&lt;br /&gt;
| width=&amp;quot;20%&amp;quot; style=&amp;quot;background-color: #000066;&amp;quot; | Independent&lt;br /&gt;
| width=&amp;quot;80%&amp;quot; | {{{independent}}}&lt;br /&gt;
|-&lt;br /&gt;
| colspan=&amp;quot;2&amp;quot; style=&amp;quot;background-color: #000099; text-align: center; color: white;&amp;quot; | &amp;#039;&amp;#039;&amp;#039;Battles&amp;#039;&amp;#039;&amp;#039;&lt;br /&gt;
|-&lt;br /&gt;
| width=&amp;quot;20%&amp;quot; style=&amp;quot;background-color: #000066;&amp;quot; | Major&lt;br /&gt;
| width=&amp;quot;80%&amp;quot; | {{{major-battles}}}&lt;br /&gt;
|-&lt;br /&gt;
| width=&amp;quot;20%&amp;quot; style=&amp;quot;background-color: #000066;&amp;quot; | Minor&lt;br /&gt;
| width=&amp;quot;80%&amp;quot; | {{{minor-battles}}}&lt;br /&gt;
|-&lt;br /&gt;
| colspan=&amp;quot;2&amp;quot; style=&amp;quot;background-color: #000099; text-align: center; color: white;&amp;quot; | &amp;#039;&amp;#039;&amp;#039;Settings&amp;#039;&amp;#039;&amp;#039;&lt;br /&gt;
|-&lt;br /&gt;
| width=&amp;quot;20%&amp;quot; style=&amp;quot;background-color: #000066;&amp;quot; | Major&lt;br /&gt;
| width=&amp;quot;80%&amp;quot; | {{{major-settings}}}&lt;br /&gt;
|-&lt;br /&gt;
| width=&amp;quot;20%&amp;quot; style=&amp;quot;background-color: #000066;&amp;quot; | Minor&lt;br /&gt;
| width=&amp;quot;80%&amp;quot; | {{{minor-settings}}}&lt;br /&gt;
|}&lt;br /&gt;
&amp;lt;noinclude&amp;gt;&lt;br /&gt;
===Usage===&lt;br /&gt;
&lt;br /&gt;
The Conflict template is used to give details pertaining to conflicts that have happened in the Galaxy. Paste code into an article, filling fields in with the pertinent information. The first four fields should be factions or groups involved in the conflict; the last four are for important battles and locations. In the (likely) event that a particular field requires multiple entries, include them all under the same field, separated by a dash (-) or a dot (&amp;amp;middot;).&lt;br /&gt;
&amp;lt;pre&amp;gt;&amp;lt;nowiki&amp;gt;&lt;br /&gt;
{{Conflict&lt;br /&gt;
| image =&lt;br /&gt;
| Side 1 =&lt;br /&gt;
| Side 2 =&lt;br /&gt;
| other =&lt;br /&gt;
| independent =&lt;br /&gt;
| major-battles =&lt;br /&gt;
| minor-battles =&lt;br /&gt;
| major-settings =&lt;br /&gt;
| minor-settings =&lt;br /&gt;
}}&lt;br /&gt;
&amp;lt;/nowiki&amp;gt;&amp;lt;/pre&amp;gt;&lt;br /&gt;
&lt;br /&gt;
[[Category:Templates|{{PAGENAME}}]]&amp;lt;/noinclude&amp;gt;&lt;/div&gt;</summary>
		<author><name>Ryan</name></author>
	</entry>
</feed>