[wondershaper/f18] Initial import (#1018498).

[Mosaab Alzoubi]

commit 3bacad014191aad477df4f240b6fec386b4bac0f
Author: Mosaab Alzoubi <moceap at hotmail.com>
Date:   Wed Nov 20 11:09:41 2013 +0200

    Initial import (#1018498).

 wondershaper.spec |    7 -------
 1 files changed, 0 insertions(+), 7 deletions(-)
---
diff --git a/wondershaper.spec b/wondershaper.spec
index b610895..db0c5dc 100644
--- a/wondershaper.spec
+++ b/wondershaper.spec
@@ -1,10 +1,6 @@
 Name:		wondershaper
 Version:	1.2.1
-<<<<<<< HEAD
-Release:	1%{?dist}
-=======
 Release:	2%{?dist}
->>>>>>> master
 Summary:	Simple Network Shaper
 Group:		Applications/Internet
 License:	GPLv2+
@@ -34,12 +30,9 @@ install -pDm 755 wshaper %{buildroot}/%{_sbindir}/%{name}
 %{_sbindir}/%{name}
 
 %changelog
-<<<<<<< HEAD
-=======
 * Wed Nov 20 2013 Mosaab Alzoubi <moceap at hotmail.com> - 1.2.1-2
 - Fix package git commit.
 
->>>>>>> master
 * Tue Nov 19 2013 Mosaab Alzoubi <moceap at hotmail.com> - 1.2.1-1
 - Update to 1.2.1 .
 - Replace URL with main program page.