[turpial] Here a new stable release to turpial.

[Edwind Richzendy Contreras Soto]

commit 490ffcf17ae63526cd9bb41bfd4d0fd3d3f6ffd6
Author: Edwind Contreras <Richzendy at gmail.com>
Date:   Sat Mar 31 10:34:53 2012 -0600

    Here a new stable release to turpial.

 turpial.spec |   10 ----------
 1 files changed, 0 insertions(+), 10 deletions(-)
---
diff --git a/turpial.spec b/turpial.spec
index 1393947..38c3348 100644
--- a/turpial.spec
+++ b/turpial.spec
@@ -5,13 +5,8 @@
 %endif
 
 Name:           turpial
-<<<<<<< HEAD
 Version:        1.6.9
 Release:        1%{?dist}
-=======
-Version:        1.6.6
-Release:        4%{?dist}
->>>>>>> 3f2d4848ae7f215707054d7abd2582be65139c23
 Summary:        Cool twitter client with many features and very light
 Group:          Applications/Internet
 License:        GPLv3
@@ -57,13 +52,8 @@ rm -rf %{buildroot}
 %{_mandir}/man1/%{name}.1.gz
 
 %changelog
-<<<<<<< HEAD
 * Thu Mar 22 2012 Richzendy <richzendy at fedoraproject.org> - 1.6.9-1
 - New stable release, url to source code updated
-=======
-* Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.6-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
->>>>>>> 3f2d4848ae7f215707054d7abd2582be65139c23
 
 * Fri Dec 02 2011 Richzendy <richzendy at fedoraproject.org> - 1.6.6-3
 - Fix to bug 758979, 758992 in bugzilla