10
0
mirror of https://github.com/LCPQ/quantum_package synced 2024-07-03 01:45:59 +02:00

Fix head in configure

This commit is contained in:
TApplencourt 2015-12-14 08:16:13 +01:00
parent 229b7c5bb2
commit 97cc7e66e0

5
configure vendored
View File

@ -156,14 +156,9 @@ bats = Info(
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",
"resultsFile", "ninja", "emsl", "ezfio", "p_graphviz",
"zeromq", "f77zmq" ]:
>>>>>>> LCPQ-master
exec ("d_info['{0}']={0}".format(m))