[mate-panel/f17: 11/11] fix merge conflict

[Wolfgang Ulbrich]

commit c195c3e910c683b5297fbc06d1a808d927c3759b
Merge: f48646b 9199ee3
Author: raveit65 <chat-to-me at raveit.de>
Date:   Sat Jul 20 00:33:09 2013 +0200

    fix merge conflict

 mate-panel.spec           |    7 +++++++
 panel-default-layout.dist |    2 +-
 2 files changed, 8 insertions(+), 1 deletions(-)
---
diff --cc mate-panel.spec
index e9b8165,85b9f19..e949d2d
--- a/mate-panel.spec
+++ b/mate-panel.spec
@@@ -1,6 -1,6 +1,10 @@@
  Name:           mate-panel
  Version:        1.6.1
++<<<<<<< HEAD
 +Release:        1%{?dist}
++=======
+ Release:        2%{?dist}
++>>>>>>> master
  Summary:        MATE Desktop panel applets
  #libs are LGPLv2+ applications GPLv2+
  License:        GPLv2+