fix conflicts in people
@@ -30,14 +30,7 @@ class Person(sc.prettyobj):
self.OR_no_treat = pars['OR_no_treat'] # Increase in the probability of dying if treatment not available
self.durpars = pars['dur'] # Store duration parameters
-<<<<<<< HEAD
- # Define states
- for state in pars['possible_states']:
- setattr(self, state, False)
- self.alive = True
-=======
# Define state
->>>>>>> develop
self.susceptible = True
# Keep track of dates
