From: Einar Jørgen Haraldseid <einar@haraldseid.net>
Date: Fri, 2 Jun 2017 20:13:33 +0000 (+0200)
Subject: fixed conflict
X-Git-Url: https://git.slaskete.net/python-gstreamer-examples/commitdiff_plain/f61c6e101a8ccc6559c475b33d2fa0a7ba0a96ba?hp=578b34cf01a5acc18d024df1884e20f799bb2b52

fixed conflict
---