remove conflict line in changelog
remove conflict line in changelog

Original commit message from CVS:
remove conflict line in changelog

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