[mozilla-adblockplus/f15: 6/6] Fix merge conflicts

[Christoph Wickert]

commit c069afc9c9cbdae52a35c94d0a15752f6e816afe
Merge: 8276c0c 4896843
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date:   Thu Aug 18 15:26:42 2011 +0200

    Fix merge conflicts

 .gitignore               |    2 ++
 mozilla-adblockplus.spec |    5 ++++-
 sources                  |    4 ++--
 3 files changed, 8 insertions(+), 3 deletions(-)
---