mirror of
https://github.com/LCPQ/quantum_package
synced 2025-01-05 11:00:10 +01:00
Fix head in configure
This commit is contained in:
parent
229b7c5bb2
commit
97cc7e66e0
5
configure
vendored
5
configure
vendored
@ -156,14 +156,9 @@ bats = Info(
|
|||||||
|
|
||||||
d_info = dict()
|
d_info = dict()
|
||||||
|
|
||||||
<<<<<<< HEAD
|
|
||||||
for m in ["ocaml", "m4", "curl", "zlib", "path", "irpf90", "docopt",
|
|
||||||
"resultsFile", "ninja", "emsl", "ezfio", "p_graphviz",'bats']:
|
|
||||||
=======
|
|
||||||
for m in ["ocaml", "m4", "curl", "zlib", "patch", "irpf90", "docopt",
|
for m in ["ocaml", "m4", "curl", "zlib", "patch", "irpf90", "docopt",
|
||||||
"resultsFile", "ninja", "emsl", "ezfio", "p_graphviz",
|
"resultsFile", "ninja", "emsl", "ezfio", "p_graphviz",
|
||||||
"zeromq", "f77zmq" ]:
|
"zeromq", "f77zmq" ]:
|
||||||
>>>>>>> LCPQ-master
|
|
||||||
exec ("d_info['{0}']={0}".format(m))
|
exec ("d_info['{0}']={0}".format(m))
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user