| commit | 538eaa1daeed199414a6568b7e196c2c6c1060ab | |
| author | Isaak <iyt2@cornell.edu> | |
| Fri, 4 Jun 2021 08:27:22 +0000 (4 10:27 +0200) | ||
| committer | Isaak <iyt2@cornell.edu> | |
| Fri, 4 Jun 2021 08:27:22 +0000 (4 10:27 +0200) | ||
| tree | 45d58dce80b1724d073c17a1ef8bc2f65db4059a | treesnapshot (tar.gz zip) |
| parent | 3d5e95515c61bb9c476dac6aba4d8d9c7df383b4 | commitdiff |
| parent | a6149b9659ac98ecddd8231d675f72e0ed10b0f2 | commitdiff |
fix merge conflict
| lib/SGN/Controller/solGS/Correlation.pm | diff1 | diff2 | blobhistory |
| lib/SGN/Controller/solGS/TraitsGebvs.pm | diff1 | diff2 | blobhistory |
| lib/SGN/Controller/solGS/solGS.pm | diff1 | diff2 | blobhistory |