[calc: 2/2] fix merge conflict from auto rebuild; also fix the date in the changelog

[Matthew Miller]

commit f2899669eeec94ef56e62ab813019edec020d434
Merge: 211e132 1003070
Author: Matthew Miller <mattdm at mattdm.org>
Date:   Sun Aug 11 11:46:40 2013 -0400

    fix merge conflict from auto rebuild; also fix the date in the changelog

 calc.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --cc calc.spec
index 10d47f5,0cd7340..fb64484
--- a/calc.spec
+++ b/calc.spec
@@@ -232,9 -232,9 +232,12 @@@ rm -rf %{buildroot
  
  
  %changelog
- * Mon May 20 2013 Matthew Miller <mattdm at fedoraproject.org> - 2.14.4.10-1
++* Sun Aug 11 2013 Matthew Miller <mattdm at fedoraproject.org> - 2.14.4.10-1
 +- upstream includes more sample scripts + minor other changes
 +
+ * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.12.4.8-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+ 
  * Mon May 20 2013 Matthew Miller <mattdm at fedoraproject.org> - 2.14.4.8-1
  - update to newer development version (build system changes only)