[bullet: 13/14] update master

[Thomas Kowaliczek]

commit 4cc35c03fd45551b49b577af055394f2ac8e550c
Author: LinuxDonald <linuxdonald at linuxdonald.de>
Date:   Wed Sep 29 01:37:59 2010 +0200

    update master

 bullet.spec |    8 --------
 1 files changed, 0 insertions(+), 8 deletions(-)
---
diff --git a/bullet.spec b/bullet.spec
index 09fa451..faf65a3 100644
--- a/bullet.spec
+++ b/bullet.spec
@@ -1,11 +1,6 @@
 Name: bullet
-<<<<<<< HEAD
-Version: 2.75
-Release: 4%{?dist}
-=======
 Version: 2.77
 Release: 2%{?dist}
->>>>>>> f14
 Summary: 3D Collision Detection and Rigid Body Dynamics Library
 Group: Development/Libraries
 License: zlib and MIT and BSD
@@ -132,8 +127,6 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-<<<<<<< HEAD
-=======
 * Wed Sep 29 2010 Thomas Kowaliczek <linuxdonald at linuxdonald.de> - 2.77-2
 - Added LibSuffix patch
 
@@ -141,7 +134,6 @@ rm -rf $RPM_BUILD_ROOT
 - Updatet to version 2.77
 - Droped all patches because they are all in upstream
 
->>>>>>> f14
 * Sat Aug 21 2010 Thomas Kowaliczek <linuxdonald at linuxdonald.de> - 2.75-4
 - Hope fix (#599495)