[mate-session-manager/f17: 14/14] fix merge conflict in .gitignore

[Wolfgang Ulbrich]

commit 2dbf06c8fe81ce8114bcaaa204ab443fa261a164
Merge: 820bef5 4900a92
Author: raveit65 <chat-to-me at raveit.de>
Date:   Sat Jul 27 01:35:32 2013 +0200

    fix merge conflict in .gitignore

 .gitignore                |    4 +--
 mate-session-manager.spec |   52 ++++++++++++++++++++++++++++++++------------
 sources                   |    2 +-
 3 files changed, 40 insertions(+), 18 deletions(-)
---
diff --cc .gitignore
index c566040,b8eb26a..084d9e0
--- a/.gitignore
+++ b/.gitignore
@@@ -1,8 -1,5 +1,6 @@@
  /mate-session-manager-1.4.0.tar.xz
  /mate-session-manager-1.5.0.tar.xz
  /mate-session-manager-1.5.1.tar.xz
- <<<<<<< HEAD
 +/mate-session-manager-1.5.2.tar.xz
- =======
  /mate-session-manager-1.6.0.tar.xz
- >>>>>>> master
+ /mate-session-manager-1.6.1.tar.xz