David Florness
David Florness
We're experiencing this issue on the release-0.11 branch (commit e3066575dc8b)
> @edwargix could you please solve merge conflicts? Sure thing; just rebased: [matrix.pr-0..matrix.pr-1](https://github.com/edwargix/notifications-engine/compare/matrix.pr-0..edwargix:notifications-engine:matrix.pr-1)
looks like https://github.com/argoproj/notifications-engine/pull/128 was just merged; will rebase again...
rebased: [matrix.pr-1..matrix.pr-2](https://github.com/edwargix/notifications-engine/compare/matrix.pr-1..edwargix:notifications-engine:matrix.pr-2)
moved indirect dependencies to correct location: [matrix.pr-2..matrix.pr-3](https://github.com/edwargix/notifications-engine/compare/matrix.pr-2..edwargix:notifications-engine:matrix.pr-3)
rebased: [matrix.pr-4..matrix.pr-5](https://github.com/edwargix/notifications-engine/compare/matrix.pr-4..edwargix:notifications-engine:matrix.pr-5)
rebased: [matrix.pr-5..matrix.pr-6](https://github.com/edwargix/notifications-engine/compare/matrix.pr-5..edwargix:notifications-engine:matrix.pr-6)
rebased: [matrix.pr-6..matrix.pr-7](https://github.com/edwargix/notifications-engine/compare/matrix.pr-6..edwargix:notifications-engine:matrix.pr-7)
rebased: [matrix.pr-7..matrix.pr-8](https://github.com/edwargix/notifications-engine/compare/matrix.pr-7..edwargix:notifications-engine:matrix.pr-8)
rebased: [matrix.pr-8..matrix.pr-9](https://github.com/edwargix/notifications-engine/compare/matrix.pr-8..edwargix:notifications-engine:matrix.pr-9)