libs: Fix some merge mistakes
authorSebastian Dröge <sebastian.droege@collabora.co.uk>
Thu, 1 Mar 2012 13:51:26 +0000 (14:51 +0100)
committerSebastian Dröge <sebastian.droege@collabora.co.uk>
Thu, 1 Mar 2012 13:51:26 +0000 (14:51 +0100)
commita8dcb63616687b3f9b91f16e2f73130fc9f13378
treefb04ef654dc85af468fd56803b945062fc3b6558
parent99a8cd104864209ab24a480f4dcef9ce39b976ae
libs: Fix some merge mistakes
libs/gst/base/gstcollectpads2.c
libs/gst/check/gstconsistencychecker.c