From a632c3c2a7f2067912dc5118ca7c28e00c853168 Mon Sep 17 00:00:00 2001
From: wrongkindofdoctor <Jessica.Liptak@ldt-4078349.gfdl.noaa.gov>
Date: Wed, 31 Jul 2019 15:58:53 -0400
Subject: [PATCH] fixed merge conflicts between master and pull request #63 in
 affinity.c

---
 mpp/affinity.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/mpp/affinity.c b/mpp/affinity.c
index 4d98b3a9..147a834a 100644
--- a/mpp/affinity.c
+++ b/mpp/affinity.c
@@ -61,9 +61,13 @@ int get_cpu_affinity(void)
     }
   }
 
+<<<<<<< HEAD
   if (last_cpu != -1) {return (first_cpu);}
   return (last_cpu == -1) ? first_cpu : -1;
 #endif
+=======
+  return first_cpu;
+>>>>>>> affinity.c get_cpu_affinity only one return
 }
 
 int get_cpu_affinity_(void) { return get_cpu_affinity(); }	/* Fortran interface */