[gnome-shell-theme-orta: 2/2] fix merge issues

[Tim Lauridsen]

commit b28beb7d11a2e26177caf44003f466f9a2f4eab3
Merge: db9111d 8352fe1
Author: Tim Lauridsen <timlau at fedoraproject.org>
Date:   Tue Jul 24 19:54:07 2012 +0200

    fix merge issues

 gnome-shell-theme-orta.spec |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)
---
diff --cc gnome-shell-theme-orta.spec
index a644494,f0175bf..84399e2
--- a/gnome-shell-theme-orta.spec
+++ b/gnome-shell-theme-orta.spec
@@@ -40,15 -44,18 +40,21 @@@ find $RPM_BUILD_ROOT -name LICENSE -typ
  
  
  %files
 -%doc gs-orta/gnome-shell/LICENSE
 +%doc gnome-shell/LICENSE
  %dir %{_datadir}/themes/%{theme}
 -%dir %{_datadir}/themes/%{theme}-dark
  %{_datadir}/themes/%{theme}/*
 -%{_datadir}/themes/%{theme}-dark/*
 +
  
  %changelog
 +* Thu Jun 09 2011 Tim Lauridsen <timlau at fedoraproject.org> 3.4
 +- Latest upstream release with gnome-shell 3.4 support
 +- fix requirements 
 +
+ * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-3
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+ 
+ * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+ 
  * Thu Jun 09 2011 Tim Lauridsen <timlau at fedoraproject.org> 1.0
  - initial rpm build