conflicts about netcdf-datareader

[tbeu]

Good news, Travis CI finally builds successfully.

[tbeu]

This was work in progress to get the 32-bit libraries built on Travis CI (after drone.io deceased its service). After 17 hours of trying I gave up - with some corrupt state obviously. 😞

[thorade]

Thanks for the effort, I'll discuss here whether we can help with compiling on travis.
Independent of whether travis works or not, I get some strange merge conflicts, should I try to solve these and send a PR?

[tbeu]

No, it rather would help if I get Travis CI building the 32-bit libs.

[thorade]

My first problem was solved by resetting the master locally to the last working state
git reset --hard 88023f4c9022bd32913d164045b25522eab2d645

[tbeu]

Sorry, I used git push --force master pretty much the last weeks. Should have used a separate branch now that you are integrating the package.

[tbeu]

What was your second problem then?

[thorade]

No second problem, closing this issue.

[thorade]

Thanks again for all the effort.
https://travis-ci.org/tbeu/netCDF-DataReader/builds