Need to merge

[bugdanov]

Hi there !

Looks like some changes could not be merged automatically and were not merged manually neither:

https://github.com/Elphel/imagej-elphel/blob/master/src/main/java/Eyesis_Correction.java#L366

Thanks !

[AndreyFilippov]

Hello Rurik, yes there is a problem that I created. I'll see what can be done, meanwhile you can try dct branch that we were using ourselves. Andrey

…

---- On Sat, 04 Feb 2017 00:58:16 -0800 Rurik Bugdanov<notifications@github.com> wrote ---- Hi there ! Looks like some changes could not be merged automatically and were not merged manually neither: https://github.com/Elphel/imagej-elphel/blob/master/src/main/java/Eyesis_Correction.java#L366 Thanks ! — You are receiving this because you are subscribed to this thread. Reply to this email directly, view it on GitHub, or mute the thread.