From 88e2e64e06e00232b1ff7ea81ffc2da819f9d61f Mon Sep 17 00:00:00 2001
From: Folkert Nobels <nobels@strw.leidenuniv.nl>
Date: Wed, 28 Nov 2018 10:58:22 +0100
Subject: [PATCH] Star of the first part of the starformation law that checks
density and temperature
---
src/starformation/schaye08/starformation.h | 8 --------
1 file changed, 8 deletions(-)
diff --git a/src/starformation/schaye08/starformation.h b/src/starformation/schaye08/starformation.h
index be67ed6846..71182fd220 100644
--- a/src/starformation/schaye08/starformation.h
+++ b/src/starformation/schaye08/starformation.h
@@ -79,7 +79,6 @@ struct star_formation {
* @brief Calculate if the gas has the potential of becoming
* a star.
*
-<<<<<<< HEAD
* @param starform the star formation law properties to use.
* @param p the gas particles
* @param xp the additional properties of the gas particles
@@ -133,18 +132,11 @@ static int starformation_potential_to_become_star(
} else {
return 0;
}
-=======
- *
- * */
-static int starformation_potential_to_become_star(
- ){
- return 0;
}
/*
* @brief Calculate if the gas particle is converted
*
-<<<<<<< HEAD
* @param starform the star formation struct
* @param p the gas particles with their properties
* @param xp the additional gas particle properties
--
GitLab