resolve merge conflicts

Author: skvark

Diff for: LICENSE-3RD-PARTY.txt

@@ -81,11 +81,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ------------------------------------------------------------------------------
 FFmpeg is redistributed within all opencv-python packages.
-Qt 4.8.7 is redistributed within opencv-python Linux packages.
+Qt 4.8.7 is redistributed within non-headless opencv-python Linux packages.
 Libuuid is redistributed within all opencv-python Linux packages.
 
 Libbluray, libgnutls, libnettle, libhogweed, libintl, libmp3lame, libp11,
-librtmp, libsoxr, libtasn1,  are redistributed within all opencv-python macOS packages.
+librtmp, libsoxr and libtasn1 are redistributed within all opencv-python macOS packages.
 
 This license applies to the above library binaries in the directory cv2/.
 
@@ -549,7 +549,7 @@ DAMAGES.
                      END OF TERMS AND CONDITIONS
 
 ------------------------------------------------------------------------------
-Qt 5 is redistributed within opencv-python macOS packages.
+Qt 5 is redistributed within non-headless opencv-python macOS packages.
 libgmp is redistributed within opencv-python macOS packages.
 libidn2 is redistributed within opencv-python macOS packages.
 libunistring is redistributed within opencv-python macOS packages.
@@ -2328,4 +2328,4 @@ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

Diff for: README.md

@@ -139,9 +139,9 @@ Third party package licenses are at [LICENSE-3RD-PARTY.txt](https://github.com/s
 
 All wheels ship with [FFmpeg](http://ffmpeg.org) licensed under the [LGPLv2.1](http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html).
 
-Linux wheels ship with [Qt 4.8.7](http://doc.qt.io/qt-4.8/lgpl.html) licensed under the [LGPLv2.1](http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html).
+Non-headless Linux wheels ship with [Qt 4.8.7](http://doc.qt.io/qt-4.8/lgpl.html) licensed under the [LGPLv2.1](http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html).
 
-MacOS wheels ship with [Qt 5](http://doc.qt.io/qt-5/lgpl.html) licensed under the [LGPLv3](http://www.gnu.org/licenses/lgpl-3.0.html).
+Non-headless MacOS wheels ship with [Qt 5](http://doc.qt.io/qt-5/lgpl.html) licensed under the [LGPLv3](http://www.gnu.org/licenses/lgpl-3.0.html).
 
 The packages include also other binaries. Full list of licenses can be found from [LICENSE-3RD-PARTY.txt](https://github.com/skvark/opencv-python/blob/master/LICENSE-3RD-PARTY.txt).