From 5c293ba9bfca884e309a5fa7f67497eddd7e6643 Mon Sep 17 00:00:00 2001
From: Simon Robertshaw <simon@hardwired.org.uk>
Date: Sat, 25 Aug 2012 16:41:34 +0100
Subject: Fix messed up revert


diff --git a/src/simulation/Simulation.cpp b/src/simulation/Simulation.cpp
index 91c12b8..450f6d3 100644
--- a/src/simulation/Simulation.cpp
+++ b/src/simulation/Simulation.cpp
@@ -3922,13 +3922,10 @@ void Simulation::update_particles_i(int start, int inc)
 				y = (int)(parts[i].y+0.5f);
 			}
 #endif
-<<<<<<< HEAD
+
+
 			if(legacy_enable)//if heat sim is off
 				Element::legacyUpdate(this, i,x,y,surround_space,nt, parts, pmap);
-=======
-			//if (legacy_enable)//if heat sim is off
-				//update_legacy_all(this, i,x,y,surround_space,nt, parts, pmap); //TODO:pop
->>>>>>> parent of d6fe7fa... Basic realistic heat and latent heat support.
 
 killed:
 			if (parts[i].type == PT_NONE)//if its dead, skip to next particle
--
cgit v0.9.2-21-gd62e