← Back to team overview

openlp-core team mailing list archive

  1. openlp-core team
  2. Mailing list archive
  3. Message #33679

Re: [Merge] lp:~sam92/openlp/bug-1695620 into lp:openlp

  Thread Previous • Date Previous • • Thread Next 
Review: Needs Fixing

I'm getting conflicts when merging with trunk, can you just re-merge trunk and fix the conflicts please?
-- 
https://code.launchpad.net/~sam92/openlp/bug-1695620/+merge/363518
Your team OpenLP Core is subscribed to branch lp:openlp.

References

  Thread Previous • Date Previous • • Thread Next