[sepostgresql: 8/8] upgrade base version to 9.0.0

[KaiGai Kohei]

commit aaf1f7379ec14cbe54e7ad22126e5cb809ae3f38
Author: KaiGai Kohei <kaigai at ak.jp.nec.com>
Date:   Tue Oct 5 10:10:56 2010 +0900

    upgrade base version to 9.0.0

 sepostgresql.init |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)
---
diff --git a/sepostgresql.init b/sepostgresql.init
index f0b27ee..bc668c4 100644
--- a/sepostgresql.init
+++ b/sepostgresql.init
@@ -7,12 +7,6 @@
 # pidfile: /var/run/postmaster.pid
 #---------------------------------------------------------------------
 
-<<<<<<< HEAD
-PGVERSION="`/bin/rpm --queryformat=%{version} -q sepostgresql`"
-PGMAJORVERSION=`echo "$PGVERSION" | sed 's/^\([0-9]*\.[0-9a-z]*\).*$/\1/'`
-
-=======
->>>>>>> 818aa330e06390c6093e3af76feabb08cddf62f9
 # source function library
 . /etc/rc.d/init.d/functions