[gstreamer1-plugins-bad-free/f19: 3/4] Fix merge conflicts.

[Brian Pepple]

commit e3bb5b0bc9af27ecc2655f50eba3b4e72d8571f5
Merge: 443acee b472e1d
Author: Brian Pepple <bpepple at fedoraproject.org>
Date:   Sat Mar 23 22:25:06 2013 -0400

    Fix merge conflicts.

 .gitignore                       |    1 +
 gstreamer1-plugins-bad-free.spec |    8 ++++++--
 sources                          |    2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)
---
diff --cc gstreamer1-plugins-bad-free.spec
index 9d34926,16e8179..2f4950d
--- a/gstreamer1-plugins-bad-free.spec
+++ b/gstreamer1-plugins-bad-free.spec
@@@ -252,9 -253,9 +253,12 @@@ chrpath --delete $RPM_BUILD_ROOT%{_libd
  %{_libdir}/pkgconfig/gstreamer-plugins-bad-%{majorminor}.pc
  
  %changelog
+ * Sun Mar 24 2013 Brian Pepple <bpepple at fedoraproject.org> - 1.0.6-1
+ - Update to 1.0.6.
+ 
 +* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.5-2
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 +
  * Tue Jan  8 2013 Brian Pepple <bpepple at fedoraproject.org> - 1.0.5-1
  - Update to 1.0.5