← Back to team overview

openlp-core team mailing list archive

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

Re: [Merge] lp:~j-corwin/openlp/migration into lp:openlp

  Thread Previous • Date Previous • • Thread Next 
Review: Needs Fixing
Please just fix up the conflict. You probably need to just do a merge from trunk into your branch and resolve the conflict there, and then propose the merge again.
-- 
https://code.edge.launchpad.net/~j-corwin/openlp/migration/+merge/21835
Your team OpenLP Core is subscribed to branch lp:openlp.

References

  Thread Previous • Date Previous • • Thread Next