mirror of
https://github.com/paboyle/Grid.git
synced 2025-04-03 02:35:55 +01:00
Merge branch 'master' of https://github.com/paboyle/Grid
This commit is contained in:
commit
8621e2409f
@ -1,5 +1,10 @@
|
||||
<<<<<<< HEAD
|
||||
#ifndef QCD_PSEUDOFERMION_TWO_FLAVOUR_RATIO_H
|
||||
#define QCD_PSEUDOFERMION_TWO_FLAVOUR_RATIO_H
|
||||
=======
|
||||
#ifndef QCD_PSEUDOFERMION_TWO_FLAVOUR_H
|
||||
#define QCD_PSEUDOFERMION_TWO_FLAVOUR_H
|
||||
>>>>>>> ef6a9e6b07b80aea909c0a62f223fa3e66f53b3a
|
||||
|
||||
namespace Grid{
|
||||
namespace QCD{
|
||||
|
Loading…
x
Reference in New Issue
Block a user