[folks: 6/6] Fix merge conflicts

[Brian Pepple]

commit 312ad3f0a1b008503fd8f341fa0c011c8ae22b08
Merge: d517cb6 fd76303
Author: Brian Pepple <bpepple at fedoraproject.org>
Date:   Sun Nov 27 18:31:49 2011 -0500

    Fix merge conflicts

 .gitignore                                         |    1 +
 ...Details-public-strings-are-non-null-as-we.patch |   57 ++++++++++++++++++++
 folks.spec                                         |    9 +++-
 3 files changed, 65 insertions(+), 2 deletions(-)
---
diff --cc folks.spec
index 4111825,e643dde..fa1469d
--- a/folks.spec
+++ b/folks.spec
@@@ -3,7 -3,7 +3,7 @@@
  Name:           folks
  Epoch:          1
  Version:        0.6.5
--Release:        2%{?dist}
++Release:        3%{?dist}
  Summary:        GObject contact aggregation library
  
  Group:          System Environment/Libraries
@@@ -83,9 -85,9 +85,12 @@@ find $RPM_BUILD_ROOT -name '*.la' -exe
  
  
  %changelog
 -* Sun Nov 27 2011 Colin Walters <walters at verbum.org> - 1:0.6.5-2
++* Sun Nov 27 2011 Colin Walters <walters at verbum.org> - 1:0.6.5-3
+ - Add patch from git to fix gnome-shell crashes
+ 
 +* Tue Nov 22 2011 Brian Pepple <bpepple at fedoraproject.org> - 1:0.6.5-2
 +- Rebuild against new eds
 +
  * Fri Nov 11 2011 Brian Pepple <bpepple at fedoraproject.org> - 1:0.6.5-1
  - Update to 0.6.5.