The command used was:
svn merge -r22349:r22347
Reference: http://www.mail-archive.com/relax-devel@.../msg05012.html
------------------------------------------------------------------------
r22349 | tlinnet | 2014-02-26 17:58:34 +0100 (Wed, 26 Feb 2014) | 3 lines
Undo of unintentional adding of code in api.py.
Regarding bug #21344, (https://gna.org/bugs/index.php?21344) - Handling of in sparse acquired R1rho dataset with missing combinations of time and spin-lock field strengths.
------------------------------------------------------------------------
r22348 | tlinnet | 2014-02-26 17:56:16 +0100 (Wed, 26 Feb 2014) | 3 lines
Modified unit test for find_intensity_keys() to simulate method in sim_pack_data().
Regarding bug #21344, (https://gna.org/bugs/index.php?21344) - Handling of in sparse acquired R1rho dataset with missing combinations of time and spin-lock field strengths.
------------------------------------------------------------------------