1
0
mirror of https://github.com/paboyle/Grid.git synced 2025-12-28 16:34:43 +00:00

Merge branch 'feature/distil' of https://github.com/mmphys/Grid into feature/distil

Conflicts:
	Grid/qcd/utils/BaryonUtils.h
	Hadrons/Modules/MContraction/Baryon2.hpp
This commit is contained in:
Felix Erben
2019-08-05 14:19:43 +01:00
8 changed files with 231 additions and 117 deletions

View File

@@ -60,7 +60,6 @@
#include <Hadrons/Modules/MContraction/WeakEye3pt.hpp>
#include <Hadrons/Modules/MContraction/WeakNonEye3pt.hpp>
#include <Hadrons/Modules/MContraction/Baryon.hpp>
#include <Hadrons/Modules/MContraction/Baryon_old.hpp>
#include <Hadrons/Modules/MContraction/Meson.hpp>
#include <Hadrons/Modules/MContraction/A2ALoop.hpp>
#include <Hadrons/Modules/MContraction/Gamma3pt.hpp>