[celestia/f20] fixed git problem

[Matías Kreder]

commit 440b8b2d9f873c49528ccf433fc3d0f5841bd0c7
Author: Matias Kreder <mkreder at gmail.com>
Date:   Sun Nov 16 16:52:27 2014 -0300

    fixed git problem

 celestia.spec |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)
---
diff --git a/celestia.spec b/celestia.spec
index 8ef6dd6..aca5f3a 100644
--- a/celestia.spec
+++ b/celestia.spec
@@ -1,10 +1,6 @@
 Name:           celestia
 Version:        1.6.1
-<<<<<<< HEAD
-Release:        15%{?dist}
-=======
 Release:        18%{?dist}
->>>>>>> master
 Summary:        OpenGL real-time visual space simulation
 Group:          Applications/Emulators
 License:        GPLv2+