← Back to team overview

openlp-core team mailing list archive

Re: [Merge] lp:~marmyshev/openlp/presentation into lp:openlp

 

Review: Needs Fixing

- You have a conflict in 'openlp/plugins/presentations/lib/presentationtab.py'

This
# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
should be
# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
We moved from 80 characters to 120.

Please do not add commented lines (e. g. 207, 221, ...).
-- 
https://code.launchpad.net/~marmyshev/openlp/presentation/+merge/154795
Your team OpenLP Core is subscribed to branch lp:openlp.


References