Removed conflicts comments line

Src/ewald.c

@@ -16,12 +16,9 @@
 /*
  * Include erfc code, unless user wants to use an erfc from libm.
  */
-<<<<<<< HEAD
-=======
 #ifndef LIBM_HAS_ERFC
 #include "MMTK/ndtr.h"
 #endif
->>>>>>> feature-remove-old-numeric-2
 #ifndef M_PI
 #define M_PI   3.14159265358979323846264338327950288
 #endif

setup.py

@@ -220,11 +220,8 @@ if sphinx:
 # Check various compiler/library properties
 
 libraries = []
-<<<<<<< HEAD
-if sys.platform != 'win32':
-=======
-if 'LIBM' in sysconfig:
->>>>>>> feature-remove-old-numeric-2
+
+if sys.platform != 'win32' and 'LIBM' in sysconfig:
     libraries.append('m')
 
 macros = []