[celestia/f20: 5/5] fixed conflict

[Matías Kreder]

commit 65e692129d1a95cfa04da83270462e4f44072553
Merge: 6badd67 5833f82
Author: Matias Kreder <mkreder at gmail.com>
Date:   Sun Nov 16 16:51:00 2014 -0300

    fixed conflict

 .gitignore                 |    1 +
 celestia-1.5.0-gcc44.patch |   26 -----------------------
 celestia-1.6.0-gcc45.patch |   49 --------------------------------------------
 celestia.spec              |   17 +++++++++++++-
 sources                    |    2 +-
 5 files changed, 17 insertions(+), 78 deletions(-)
---
diff --cc celestia.spec
index a211e7c,aca5f3a..8ef6dd6
--- a/celestia.spec
+++ b/celestia.spec
@@@ -1,6 -1,6 +1,10 @@@
  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+