Advanced Computing Platform for Theoretical Physics

commit大文件会使得服务器变得不稳定,请大家尽量只commit代码,不要commit大的文件。

Commit f0247f5f authored by mikeaclark's avatar mikeaclark
Browse files

Fixed conflict problem

git-svn-id: http://lattice.bu.edu/qcdalg/cuda/quda@587 be54200a-260c-0410-bdd7-ce6af2a381ab
parent 479eb285
......@@ -24,7 +24,6 @@ void initBlas();
#define INIT_PARAM
#include "check_params.h"
#undef INIT_PARAM
>>>>>>> .r585
// define (static) checkGaugeParam() and checkInvertParam()
#define CHECK_PARAM
......
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