ChangeLog: Remove cvs conflict marker.
ChangeLog: Remove cvs conflict marker.

Original commit message from CVS:
* ChangeLog:
Remove cvs conflict marker.

Lachann/gstreamer,ensonic/gstreamer,krichter722/gstreamer,justinjoy/gstreamer,mrchapp/gstreamer,ylatuya/gstreamer,cablelabs/gstreamer,ensonic/gstreamer,Lachann/gstreamer,cablelabs/gstreamer,mrchapp/gstreamer,surround-io/gstreamer,justinjoy/gstreamer,ahmedammar/platform_external_gst_gstreamer,ahmedammar/platform_external_gst_gstreamer,cfoch/gstreamer,justinjoy/gstreamer,lovebug356/gstreamer,drothlis/gstreamer,jpakkane/gstreamer,magcius/gstreamer,Distrotech/gstreamer,lubosz/gstreamer,shelsonjava/gstreamer,mparis/gstreamer,krieger-od/gstreamer,lovebug356/gstreamer,surround-io/gstreamer,lubosz/gstreamer,collects/gstreamer,drothlis/gstreamer,ahmedammar/platform_external_gst_gstreamer,krieger-od/gstreamer,centricular/gstreamer,surround-io/gstreamer,ahmedammar/platform_external_gst_gstreamer,Lachann/gstreamer,krichter722/gstreamer,Distrotech/gstreamer,StreamUtils/gstreamer,StreamUtils/gstreamer,cfoch/gstreamer,Lachann/gstreamer,shelsonjava/gstreamer,jpxiong/gstreamer,magcius/gstreamer,cfoch/gstreamer,cablelabs/gstreamer,mrchapp/gstreamer,justinjoy/gstreamer,shelsonjava/gstreamer,krichter722/gstreamer,jpxiong/gstreamer,centricular/gstreamer,Distrotech/gstreamer,justinjoy/gstreamer,magcius/gstreamer,mparis/gstreamer,ensonic/gstreamer,cablelabs/gstreamer,mrchapp/gstreamer,jpxiong/gstreamer,lubosz/gstreamer,ylatuya/gstreamer,shelsonjava/gstreamer,mrchapp/gstreamer,ensonic/gstreamer,ylatuya/gstreamer,jpakkane/gstreamer,StreamUtils/gstreamer,drothlis/gstreamer,krieger-od/gstreamer,surround-io/gstreamer,magcius/gstreamer,cablelabs/gstreamer,Lachann/gstreamer,krieger-od/gstreamer,ensonic/gstreamer,lovebug356/gstreamer,collects/gstreamer,collects/gstreamer,collects/gstreamer,ahmedammar/platform_external_gst_gstreamer,ylatuya/gstreamer,StreamUtils/gstreamer,jpxiong/gstreamer,lubosz/gstreamer,jpxiong/gstreamer,StreamUtils/gstreamer,centricular/gstreamer,collects/gstreamer,krichter722/gstreamer,cfoch/gstreamer,centricular/gstreamer,jpakkane/gstreamer,centricular/gstreamer,ylatuya/gstreamer,mparis/gstreamer,surround-io/gstreamer,magcius/gstreamer,krichter722/gstreamer,krieger-od/gstreamer,cfoch/gstreamer,jpakkane/gstreamer,lovebug356/gstreamer,Distrotech/gstreamer,drothlis/gstreamer,lubosz/gstreamer,mparis/gstreamer,shelsonjava/gstreamer,mparis/gstreamer,lovebug356/gstreamer,jpakkane/gstreamer,Distrotech/gstreamer,drothlis/gstreamer