[udftools: 4/4] fixed merging conflicts

[Jan Horak]

commit a1f7d2b4ae42848f14c23e5f226b938e7e419e36
Merge: 42247ad f265332
Author: Honza Horák <hhorak at redhat.com>
Date:   Fri Jan 27 13:20:35 2012 +0100

    fixed merging conflicts

 udftools.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --cc udftools.spec
index b559efd,7096142..e3bf740
--- a/udftools.spec
+++ b/udftools.spec
@@@ -1,7 -1,7 +1,7 @@@
  Summary: Linux UDF Filesystem userspace utilities
  Name: udftools
  Version: 1.0.0b3
--Release: 14%{?dist}
++Release: 15%{?dist}
  License: GPLv2+
  Group: Applications/Archiving
  URL: http://sourceforge.net/projects/linux-udf/
@@@ -58,11 -54,9 +58,14 @@@ export CFLAGS="$RPM_OPT_FLAGS -fno-stri
  
  
  %changelog
- * Thu Jan 26 2012 Honza Horak <hhorak at redhat.com> - 1.0.0b3-14
++* Thu Jan 26 2012 Honza Horak <hhorak at redhat.com> - 1.0.0b3-15
 +- fixed segmentation fault
 +  Resolves: #685005
 +- fixed some most obvious issues from static analysis
 +
+ * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.0b3-14
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+ 
  * Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.0b3-13
  - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild