Closed LaurieLYJ closed 8 years ago
There seems to be a merge conflict.
Did you mean to edit LinearMixedModel files?
Please keep ICLasso and LMM changes on their own branches. Git can be really annoying - message me on slack if you would like help.
ttest merged in #110
There seems to be a merge conflict.