[zhu3d/f17: 3/3] Fix Source errors

siddharths siddharths at fedoraproject.org
Sun Jul 15 18:18:32 UTC 2012


commit 9cfed94f476452996a807a9bb548907b1e89c7aa
Merge: 1797b0c c5f385f
Author: Siddharth Sharma <siddharth.kde at gmail.com>
Date:   Sun Jul 15 23:49:44 2012 +0530

    Fix Source errors

 zhu3d.spec |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)
---
diff --cc zhu3d.spec
index b56b53a,49f97d7..51e18e4
--- a/zhu3d.spec
+++ b/zhu3d.spec
@@@ -74,10 -74,6 +74,7 @@@ rm -rf %{buildroot
  %{_datadir}/applications/zhu3d.desktop
   
  %changelog
- <<<<<<< HEAD
- * Sun Jul 15 2012 Siddharth Sharma <siddharth.kde at gmail.com> - 4.2.4-1
- - rebuilt 
- =======
++
  * Sun Jul 15 2012 Siddharth Sharma <siddharth.kde at gmail.com> - 4.2.4-2
  - rebuilt commit fixes for source
  


More information about the scm-commits mailing list