diff options
| author | hf@genie.(none) <> | 2002-11-29 12:35:48 +0400 |
|---|---|---|
| committer | hf@genie.(none) <> | 2002-11-29 12:35:48 +0400 |
| commit | 5e8b27c0d3414244c31fec9242bad8225bee5b07 (patch) | |
| tree | 7aa1227117cb2c279c639fbe58eeace841422330 /BitKeeper | |
| parent | e1cb867968716584107645c2d90cf32b0b621106 (diff) | |
| parent | 25bd1e9a3702abe78d086d19b246a885c951f577 (diff) | |
| download | mariadb-git-5e8b27c0d3414244c31fec9242bad8225bee5b07.tar.gz | |
Pull conflicts resolutions
Diffstat (limited to 'BitKeeper')
| -rw-r--r-- | BitKeeper/etc/logging_ok | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index c424926a248..2d1e2991d32 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -21,6 +21,8 @@ heikki@donna.mysql.fi heikki@hundin.mysql.fi heikki@rescue. heikki@work.mysql.com +hf@bison.(none) +hf@bisonxp.(none) hf@genie.(none) jani@dsl-jkl1657.dial.inet.fi jani@hynda.(none) |