summaryrefslogtreecommitdiff
path: root/ext/mysql/php_mysql.h
diff options
context:
space:
mode:
authorAndi Gutmans <andi@php.net>2000-10-01 10:54:11 +0000
committerAndi Gutmans <andi@php.net>2000-10-01 10:54:11 +0000
commitd4b0d7850dfdcf9c6eb0b242d60c91db74689e59 (patch)
tree3ea4d40fa6e73469181dde81ca78cd2c46c75829 /ext/mysql/php_mysql.h
parente597dbd0be0377cc452e137594d2ca26e685bc5d (diff)
downloadphp-git-d4b0d7850dfdcf9c6eb0b242d60c91db74689e59.tar.gz
- Fixed conflicts. Those first two lines with the XXX need to be fixed.
I'm not sure if they were meant to be in the Changelog or NEWS file, in any case they are broken. Whoever, commited them can you please fix it? I couldn't find who commited them in the CVS commit messages
Diffstat (limited to 'ext/mysql/php_mysql.h')
0 files changed, 0 insertions, 0 deletions