Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Scientific Software
mmtk
Commits
1eb24a00
Commit
1eb24a00
authored
Feb 20, 2018
by
eric pellegrini
Browse files
Removed conflicts comments line
parent
4be82470
Changes
2
Hide whitespace changes
Inline
Side-by-side
Src/ewald.c
View file @
1eb24a00
...
...
@@ -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
View file @
1eb24a00
...
...
@@ -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
=
[]
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment