[groonga/f18] I had done wrong commit and push, so I've fixed it

[kenhys]

commit 0fb10f369f30870119e5d746558e2f38ef6dc5ee
Author: HAYASHI Kentaro <kenhys at gmail.com>
Date:   Wed May 29 02:37:27 2013 +0900

    I had done wrong commit and push, so I've fixed it

 groonga.spec |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)
---
diff --git a/groonga.spec b/groonga.spec
index e6d52bb..d2b7915 100644
--- a/groonga.spec
+++ b/groonga.spec
@@ -1,15 +1,9 @@
 %global php_extdir  %(php-config --extension-dir 2>/dev/null || echo "undefined")
 %global __provides_exclude_from ^(%{python_sitelib}/.*\\.so|%{php_extdir}/.*\\.so)$
 %global _hardened_build 1
-<<<<<<< HEAD
- 
-Name:		groonga
-Version:	3.0.3
-=======
 
 Name:		groonga
 Version:	3.0.4
->>>>>>> master
 Release:	1%{?dist}
 Summary:	An Embeddable Fulltext Search Engine