[pidgin/f16: 4/4] Fix merge

[Stu Tomlinson]

commit b7d419243a972a9c6d6bd6bb32d88f9d8a13c596
Author: Stu Tomlinson <stu at nosnilmot.com>
Date:   Sun Aug 21 16:29:22 2011 +0100

    Fix merge

 pidgin.spec |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)
---
diff --git a/pidgin.spec b/pidgin.spec
index a836acd..1686920 100644
--- a/pidgin.spec
+++ b/pidgin.spec
@@ -102,13 +102,8 @@
 %endif
 
 Name:           pidgin
-<<<<<<< HEAD
-Version:        2.9.0
-Release:        3%{?dist}
-=======
 Version:        2.10.0
 Release:        1%{?dist}
->>>>>>> master
 License:        GPLv2+ and GPLv2 and MIT
 # GPLv2+ - libpurple, gnt, finch, pidgin, most prpls
 # GPLv2 - silc & novell prpls