<ParticleSystem>
	<Emitters>
		<ParticleSpriteEmitter tex="Data\\textures\\circle.png">
			<startSize value="1"/>
			<endSize value="1"/>

			<emitterShape value="1"/>
			<emitterBlendMode value="1"/>

			<perSecond value="200"/>
			<maxCount value="5000"/>

<<<<<<< local
            <lifetime value="5"/>
            <lifetimeDeviation value="1"/>

			<velocity value="40.000000"/>
			<velocityDeviation value="0.000000"/>
			<velocityVector x="1.000000" y="0.000000" z="0.000000"/>
            <velocityVectorDeviationAngle value="0.2"/>

            <gravity value="true"/>
            <gravityValue value="9.8"/>

            <particleStartRotation value="-0.5"/>
            <particleStartRotationDeviation value="1.0"/>
            <particleRotationSpeed value="-0.5"/>
            <particleRotationSpeedDeviation value="1.0"/>
=======
            <lifetime value="5"/>
            <lifetimeDeviation value="1"/>

			<velocity value="40.000000"/>
			<velocityDeviation value="0.000000"/>
			<velocityVector x="1.000000" y="0.000000" z="0.000000"/>
            <velocityVectorDeviationAngle value="1"/>

            <gravity value="false"/>
            <gravityValue value="3.0"/>

            <particleStartRotation value="-0.5"/>
            <particleStartRotationDeviation value="1.0"/>
            <particleRotationSpeed value="-0.5"/>
            <particleRotationSpeedDeviation value="1.0"/>
>>>>>>> other

			<height value="100.0"/>
			<apex value="0.0"/>
			<base value="50.0"/>
			<radius value="50.0"/>

            <particleDeviationX value="00"/>
            <particleDeviationY value="00"/>
            <particleDeviationZ value="00"/>

			<startColor x="1.0" y="1.0" z="1.0"/>
			<endColor x="0.7" y="0.5" z="0.0"/>

			<startAlpha value="1.0"/>
			<endAlpha value="1.0"/>


			<looped value="true"/>
			<startTime value="5.0"/>
			<deathTime value="10.0"/>

			<position x="0.0" y="50.0" z="0.0"/>

		</ParticleSpriteEmitter>

	</Emitters>
</ParticleSystem>