[mate-text-editor/f20: 2/2] fix merge conflicts

[Wolfgang Ulbrich]

commit 6eede446140155cda1706a4321a1ece96a8777e2
Merge: 32f6473 e40a56e
Author: raveit65 <chat-to-me at raveit.de>
Date:   Wed Jan 1 16:22:24 2014 +0100

    fix merge conflicts

 mate-text-editor.spec |   35 ++++++++++++++++++++++++++++-------
 sources               |    4 ++++
 2 files changed, 32 insertions(+), 7 deletions(-)
---
diff --cc mate-text-editor.spec
index 0aaecf4,de55e69..6260f60
--- a/mate-text-editor.spec
+++ b/mate-text-editor.spec
@@@ -1,6 -1,6 +1,10 @@@
  Summary:  Text editor for the MATE desktop
  Name:     mate-text-editor
++<<<<<<< HEAD
 +Version:  1.6.1
++=======
+ Version:  1.7.0
++>>>>>>> master
  Release:  1%{?dist}
  License:  GPLv2+
  Group:    Applications/Editors
@@@ -56,7 -60,6 +64,10 @@@ Development files for mate-text-edito
  
  %prep
  %setup -q
++<<<<<<< HEAD
 +#NOCONFIGURE=1 ./autogen.sh
++=======
++>>>>>>> master
  
  # Fix debug permissions with messy hack 
  find ./*/* -type f -exec chmod 644 {} \;
@@@ -113,9 -118,8 +126,12 @@@ f
  %files  -f pluma.lang
  %doc README COPYING AUTHORS
  %{_datadir}/pluma
- %{_datadir}/mate/help/pluma
+ %{_datadir}/help/*/pluma
  %{_datadir}/applications/pluma.desktop
++<<<<<<< HEAD
 +%{_datadir}/omf/pluma
++=======
++>>>>>>> master
  %{_datadir}/gtk-doc/html/pluma
  %{_mandir}/man1/*
  %{_libdir}/pluma
@@@ -131,9 -135,10 +147,14 @@@
  %{_libdir}/pkgconfig/pluma.pc
  
  
 -
  %changelog
++<<<<<<< HEAD
 +* Wed Jan 1 2014 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.6.1-1
 +- update to 1.6.1 release
++=======
+ * Fri Dec 06 2013 Dan Mashal <dan.mashal at fedoraproject.org> - 1.7.0-1
+ - Update to 1.7.0
++>>>>>>> master
  
  * Thu Aug 08 2013 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.6.0-5
  - add runtime require mate-file-manager-schemas to fix #959607
diff --cc sources
index 37c5051,17abcb1..194bfaf
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
 +3cfbd6d709b74e57b9b907c141ba5fdb  mate-text-editor-1.6.1.tar.xz
++=======
+ 6bf33a42e00a716b878b2991550edd57  mate-text-editor-1.7.0.tar.gz
++>>>>>>> master