com php-src: Fix merge conflict: ext/session/session.c
| From: | Yasuo Ohgaki | Date: | Tue, 15 Dec 2015 01:30:16 +0000 |
| Subject: | com php-src: Fix merge conflict: ext/session/session.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-90276@lists.php.net to get a copy of this message | ||
Commit: 1e042ae4a78fa332a6869087f54c8a9a3caaa978
Author: Yasuo Ohgaki <yohgaki@php.net> Tue, 15 Dec 2015 10:30:16 +0900
Parents: 56bf10f0bd9a1b2d88b4cb2ac6e45ebf46925adc 8161230505f224449c4d4e3ff1f0c2c7ee2d040c
Branches: PHP-7.0 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1e042ae4a78fa332a6869087f54c8a9a3caaa978
Log:
Fix merge conflict
Changed paths:
MM ext/session/session.c
Diff: