fixed merge conflicts between master and pull request NOAA-EMC#63 in …

…affinity.c
hyunchul386 · Jul 31, 2019 · a632c3c · a632c3c
1 parent f2e2c86
commit a632c3c
Showing 1 changed file with 4 additions and 0 deletions.
diff --git 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 */