portelli/Grid
1
0
Fork 0
mirror of https://github.com/paboyle/Grid.git synced 2025-06-10 19:36:56 +01:00
Code Releases Activity

Merge branch 'master' of https://github.com/paboyle/Grid

Browse Source
This commit is contained in:
Peter Boyle
2015-08-18 09:23:58 +01:00
parent 7622f0c441 ef6a9e6b07
commit 8621e2409f
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/qcd/action/pseudofermion/TwoFlavourRatio.h
View File

@ -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{