[powerline/f20] Fix Version and Release.

[asn]

commit 5acaf503917a206cb7bbea17d0525fa722e1c9bd
Author: Andreas Schneider <asn at cryptomilk.org>
Date:   Wed Dec 3 17:38:37 2014 +0100

    Fix Version and Release.

 powerline.spec |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)
---
diff --git a/powerline.spec b/powerline.spec
index 786d1f1..e1c1d98 100644
--- a/powerline.spec
+++ b/powerline.spec
@@ -1,11 +1,6 @@
 Name:           powerline
-<<<<<<< HEAD
-Version:        0.0.1
-Release:        7%{checkout}%{?dist}
-=======
 Version:        1.3
 Release:        1%{?dist}
->>>>>>> d23715d... Update to version 1.3.
 
 Summary:        The ultimate status-line/prompt utility
 License:        MIT