[frescobaldi: 2/2] Fixed merge conflicts

[Brendan Jones]

commit 93e93bf1a374d672344fe9292710cda52d6a4cbf
Merge: e3b4fd2 d2b09b0
Author: Brendan Jones <brendan.jones.it at gmail.com>
Date:   Mon Jan 16 18:58:02 2012 +0100

    Fixed merge conflicts

 frescobaldi.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc frescobaldi.spec
index aabe18c,4ba1a7a..170220b
--- a/frescobaldi.spec
+++ b/frescobaldi.spec
@@@ -94,19 -105,19 +94,22 @@@ f
  gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
  
  %files -f %{name}.lang
 -%defattr(-,root,root,-)
  %doc ChangeLog COPYING README* THANKS TODO
 -%{_docdir}/HTML/en/%{name}/
  %{_bindir}/%{name}
 +%{python_sitelib}/%{name}_app
 +# the following is in our lang file
 +%exclude %{python_sitelib}/%{name}_app/po
 +%{python_sitelib}/%{name}-%{version}-py2.7.egg-info
  %{_datadir}/applications/%{name}.desktop
  %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
 -%{_datadir}/kde4/apps/%{name}/
 -%{_datadir}/config/%{name}rc
  
  %changelog
 +* Sun Dec 11 2011 Brendan Jones <brendan.jones.it at gmail.com> - 2.0.2-1
 +- New upstream version
 +
+ * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.0-3
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+ 
  * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.0-2
  - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild