[sugar-nutrition: 2/2] fixed merge

[Kalpa Welivitigoda]

commit 213dec58d3fb96176a84f0c49b22490c873c8bd4
Merge: 3b70af3 c7b74d4
Author: Kalpa Welivitigoda <callkalpa at gmail.com>
Date:   Mon Mar 25 21:20:59 2013 +0530

    fixed merge

 sugar-nutrition.spec |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
---
diff --cc sugar-nutrition.spec
index c24a40e,1f2138e..7cd66e3
--- a/sugar-nutrition.spec
+++ b/sugar-nutrition.spec
@@@ -35,9 -35,9 +35,13 @@@ food and nutrition
  %{sugaractivitydir}/Nutrition.activity/
  
  %changelog
++
 +* Mon Mar 25 2013 Kalpa Welivitigoda <callkalpa at gmail.com> - 11-1
 +- new version 11
 +
+ * Fri Feb 15 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 9-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+ 
  * Mon Nov 19 2012 Kalpa Welivitigoda <callkalpa at gmail.com> - 9-1
  - new version 9