Bug#660798: gstreamer0.10: Merge conflict marker leftover on changelog

[Guillem Jover]

Source: gstreamer0.10
Source-Version: 0.10.36-1
Severity: minor

Hi!

There's a merge conflict marker (“>>>>>>> experimental”) in the
Debian changelog file, just before the 0.10.35-1 version entry.

thanks,
guillem