Merge conflicts should now be resolved. On Wed, Sep 5, 2018 at 8:35 AM Fokko Driesprong <[email protected]> wrote:
> Still some merge conflicts :( @wmorris75 <https://github.com/wmorris75> > > — > You are receiving this because you were mentioned. > Reply to this email directly, view it on GitHub > <https://github.com/apache/incubator-airflow/pull/3828#issuecomment-418713995>, > or mute the thread > <https://github.com/notifications/unsubscribe-auth/AHlcZv7h5FYFqV6Uu2RPMtR42q3UA0hhks5uX8UagaJpZM4WVczQ> > . > -- With kind regards, Wayne Morris [ Full content available at: https://github.com/apache/incubator-airflow/pull/3828 ] This message was relayed via gitbox.apache.org for [email protected]
