From: Einar Jørgen Haraldseid 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?ds=sidebyside;hp=-c fixed conflict --- f61c6e101a8ccc6559c475b33d2fa0a7ba0a96ba