search

padsley / k600analyser

Code for the K600 analyser including plugin codes for silicon, clover and HAGAR data
1 stars 4 forks source link

PR217 changes into master #147

Closed padsley closed 7 years ago

padsley commented 7 years ago

@LindsD has been making additional changes for the lineshape correction that we want to merge into the master branch. This might need a bit of work as other changes have been made. Pull request for exactly that purpose.

Someone else should do the merge as I don't know where the changes are.

padsley commented 7 years ago

...by someone else, @neveling has been designated for the review...

neveling commented 7 years ago

Conflicts resolved, changes approved.

padsley commented 7 years ago

OK. I did the merge commit but will leave PR217 open so that @LindsD can use it for any future changes (if she wants).