From 1797b0c20b53122250a7f27ee26c1a2d2f6f50dc Mon Sep 17 00:00:00 2001
From: Siddharth Sharma <siddharth.kde@gmail.com>
Date: Jul 15 2012 18:18:40 +0000
Subject: Source set


---

diff --git a/zhu3d.spec b/zhu3d.spec
index ae218cf..b56b53a 100644
--- a/zhu3d.spec
+++ b/zhu3d.spec
@@ -1,6 +1,6 @@
 Name:      zhu3d
 Version:   4.2.4
-Release:   1%{dist}
+Release:   2%{dist}
 Summary:   Interactive OpenGL-based mathematical function viewer
 Group:     Applications/System
 License:   GPLv3
@@ -74,8 +74,16 @@ rm -rf %{buildroot}
 %{_datadir}/applications/zhu3d.desktop
  
 %changelog
+<<<<<<< HEAD
 * Sun Jul 15 2012 Siddharth Sharma <siddharth.kde@gmail.com> - 4.2.4-1
 - rebuilt 
+=======
+* Sun Jul 15 2012 Siddharth Sharma <siddharth.kde@gmail.com> - 4.2.4-2
+- rebuilt commit fixes for source
+
+* Fri Mar 2 2012 siddvicious <siddharth.kde@gmail.com> - 4.2.4-1
+- Package Update
+>>>>>>> master
 
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.2.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild