diff options
| author | unknown <paul@central.snake.net> | 2000-12-06 16:39:43 -0600 |
|---|---|---|
| committer | unknown <paul@central.snake.net> | 2000-12-06 16:39:43 -0600 |
| commit | 51f6e1752057446e0c5986f2ffc4e554c6be4f5c (patch) | |
| tree | 93e74a06520b0f54ccfb60ab6b31d42c33d26385 /BitKeeper | |
| parent | 0a1fcefba7f2b458cf6d7aa37ca1b081869caf82 (diff) | |
| parent | 1282360e16844e65d46f6f3691202d69ad562ae3 (diff) | |
| download | mariadb-git-51f6e1752057446e0c5986f2ffc4e554c6be4f5c.tar.gz | |
resolve merge problem
BitKeeper/etc/logging_ok:
auto-union
Diffstat (limited to 'BitKeeper')
| -rw-r--r-- | BitKeeper/etc/logging_ok | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index d29bd44c29f..29ed835619f 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -6,6 +6,7 @@ monty@donna.mysql.com monty@narttu.mysql.fi mwagner@evoq.home.mwagner.org mwagner@work.mysql.com +paul@central.snake.net sasha@donna.mysql.com sasha@laptop.slkc.uswest.net sasha@mysql.sashanet.com |