paboyle 4908b77d46 Fixed conflicts. PLEASE avoid making wholesale cosmetic only changes, this created ... a HUGE amount of difficult to resolve and understand conflicts . Wholesale formatting, reordering functions etc... in a central file like Tensor_class or Grid_vector_types while others are also editing without making substantial functionality changes creates pain.		2016-07-15 20:59:07 +01:00
..
Cartesian_base.h	Fixed conflicts. PLEASE avoid making wholesale cosmetic only changes, this created	2016-07-15 20:59:07 +01:00
Cartesian_full.h	Global edit adding copyright and license info to every source file.	2016-01-02 14:51:32 +00:00
Cartesian_red_black.h	Merge branch 'develop' of https://github.com/paboyle/Grid into develop	2016-07-15 19:26:06 +01:00