[apt/f20] Revert "fixes"

[Mosaab Alzoubi]

commit 9003ecf8723972c14170580b3523a03d4100dad6
Author: Mosaab Alzoubi <moceap at hotmail.com>
Date:   Fri Mar 13 18:54:20 2015 +0300

    Revert "fixes"
    
    This reverts commit 12017eb8aebc70b00d1713c7707e455ebdb3a8ca.

 apt.spec | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
---
diff --git a/apt.spec b/apt.spec
index d788e50..73cc898 100644
--- a/apt.spec
+++ b/apt.spec
@@ -15,7 +15,15 @@
 Summary: Debian's Advanced Packaging Tool with RPM support
 Name: apt
 Version: %{aptver}
+<<<<<<< HEAD
+<<<<<<< HEAD
+Release: 10.%{snapver}.1%{?dist}
+=======
+Release: 16.%{snapver}%{?dist}
+>>>>>>> master
+=======
 Release: 17.%{snapver}%{?dist}
+>>>>>>> master
 Group: System Environment/Base
 URL: http://apt-rpm.org/
 # SourceLicense: GPLv2+ except lua/ which is MIT
@@ -381,7 +389,13 @@ rm -f %{buildroot}%{_libdir}/*.la
 
 
 %changelog
+<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+* Wed Mar 11 2015 Mosaab Alzoubi <moceap at hotmail.com> - 0.5.15lorg3.95-16.git522
+=======
 * Wed Mar 11 2015 Mosaab Alzoubi <moceap at hotmail.com> - 0.5.15lorg3.95-17.git522
+>>>>>>> master
 - Accept Vaclav Pavlin patch #850028
 - Support F21 with old lua
 - Set apt.service attr to 644 #1158853
@@ -406,6 +420,7 @@ rm -f %{buildroot}%{_libdir}/*.la
 * Tue Jun  3 2014 Tom Callaway <spot at fedoraproject.org> - 0.5.14lorg3.95-11.git522
 - fix format-security issues
 
+>>>>>>> master
 * Tue May 20 2014 Tom Callaway <spot at fedoraproject.org> - 0.5.14lorg3.95-10.git522.1
 - updated lua fix