From 2f0cc677daf83efe386ec94491f2fead1f5b54e7 Mon Sep 17 00:00:00 2001
From: Robert Izzard <r.izzard@surrey.ac.uk>
Date: Thu, 14 Nov 2019 14:25:41 +0100
Subject: [PATCH] fix clashes in 2.1.4
---
src/binary_c_structures.h | 8 --------
src/nucsyn/nucsyn_remove_mass_from_surface.c | 5 -----
2 files changed, 13 deletions(-)
diff --git a/src/binary_c_structures.h b/src/binary_c_structures.h
index 9c8234e63..5ad82b1fe 100644
--- a/src/binary_c_structures.h
+++ b/src/binary_c_structures.h
@@ -1361,11 +1361,7 @@ struct star_t {
double spiky_luminosity; // L modulated by pulse rise/fall
double prev_tagb;
-<<<<<<< HEAD
- double dmacc; /* mass of accreted layer */
-=======
double dmacc; /* mass of accreted layer, used in NUCSYN and novae */
->>>>>>> izzard-discs
#ifdef NUCSYN
/* Nucleosynthesis stuff */
/* stuff you might want to log */
@@ -1387,10 +1383,6 @@ struct star_t {
double mixdepth,mixtime;
double dmmix; /* mass of mixed region at the stellar surface */
double conv_base; /* mass coord of surface convection zone (on MS) */
-<<<<<<< HEAD
-=======
-
->>>>>>> izzard-discs
double dm_companion_SN; /* mass change caused by companion supernova */
double max_mix_depth;
diff --git a/src/nucsyn/nucsyn_remove_mass_from_surface.c b/src/nucsyn/nucsyn_remove_mass_from_surface.c
index 800a91338..d5d4caaa6 100644
--- a/src/nucsyn/nucsyn_remove_mass_from_surface.c
+++ b/src/nucsyn/nucsyn_remove_mass_from_surface.c
@@ -37,9 +37,4 @@ void nucsyn_remove_mass_from_surface(
*allocated = FALSE;
}
}
-<<<<<<< HEAD
-
#endif //NUCSYN
-=======
-#endif // NUCSYN
->>>>>>> izzard-discs
--
GitLab