diff options
author | unknown <cmiller@zippy.cornsilk.net> | 2006-11-02 18:27:52 -0500 |
---|---|---|
committer | unknown <cmiller@zippy.cornsilk.net> | 2006-11-02 18:27:52 -0500 |
commit | 65e3646258bb2700d1c0e70af343a9c8c5c160be (patch) | |
tree | fa8005084be1c331a61237fea5274219548a0156 /ndb/tools/make-errors.pl | |
parent | e1a722b2d3a428c650bf08527b8c9ed9bdbd3e08 (diff) | |
download | mariadb-git-65e3646258bb2700d1c0e70af343a9c8c5c160be.tar.gz |
Fix merge collision.
Diffstat (limited to 'ndb/tools/make-errors.pl')
0 files changed, 0 insertions, 0 deletions