[googsystray: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/googsystray

[Leon Keijser]

commit fd150d6dc6cc6c50afdfd13db3b52990ec492127
Merge: faa059f 297adf4
Author: Léon Keijser <keijser at stone-it.com>
Date:   Mon Feb 14 06:57:11 2011 +0100

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/googsystray
    
    Conflicts:
    	googsystray.spec

 googsystray.spec |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)
---
diff --cc googsystray.spec
index 95a515b,7e0e686..944be6d
--- a/googsystray.spec
+++ b/googsystray.spec
@@@ -4,8 -4,8 +4,13 @@@
  %endif
  
  Name:           googsystray
++<<<<<<< HEAD
 +Version:        1.3.1
 +Release:        1%{?dist}
++=======
+ Version:        1.2.0
+ Release:        3%{?dist}
++>>>>>>> 297adf4db46e228675bd1901b80087910b0c980b
  Summary:        A system tray application for accessing various (online) Google apps
  
  Group:          Applications/Internet
@@@ -69,8 -68,8 +74,13 @@@ rm -rf %{buildroot
  
  
  %changelog
++<<<<<<< HEAD
 +* Mon Feb 14 2011 L.S. Keijser <keijser at stone-it.com> - 1.3.1-1
 +- new version from upstream
++=======
+ * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.0-3
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
++>>>>>>> 297adf4db46e228675bd1901b80087910b0c980b
  
  * Wed Jul 21 2010 David Malcolm <dmalcolm at redhat.com> - 1.2.0-2
  - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild