Commit 1eb24a00 authored by eric pellegrini's avatar eric pellegrini
Browse files

Removed conflicts comments line

parent 4be82470
......@@ -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
......
......@@ -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 = []
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment