Forgotten from merge

nicolasff · nicolasff · commit 8287e8d3147c · 2010-12-14T16:37:55.000+01:00
diff --git a/redis.c b/redis.c
@@ -4568,7 +4568,6 @@ PHP_METHOD(Redis, slaveof)
 }
 /* }}} */
 
-<<<<<<< HEAD
 /* {{{ proto string Redis::getOption($option)
  */
 PHP_METHOD(Redis, getOption)  {

Original file line number	Diff line number	Diff line change
`@@ -4568,7 +4568,6 @@ PHP_METHOD(Redis, slaveof)`
`4568`	`4568`	`}`
`4569`	`4569`	`/* }}} */`
`4570`	`4570`
`4571`		`-<<<<<<< HEAD`
`4572`	`4571`	`/* {{{ proto string Redis::getOption($option)`
`4573`	`4572`	`*/`
`4574`	`4573`	`PHP_METHOD(Redis, getOption) {`