diff options
| author | unknown <guilhem@mysql.com> | 2004-11-19 00:57:26 +0100 |
|---|---|---|
| committer | unknown <guilhem@mysql.com> | 2004-11-19 00:57:26 +0100 |
| commit | fb36bc2a43b910ed5a46dba72153e2cc795b51b2 (patch) | |
| tree | 3536f7e0a2d1679a4d437237b4ada4ec9a06c5e7 | |
| parent | 31914653cd70ecf0771dc047f8cf37a89ba77034 (diff) | |
| download | mariadb-git-fb36bc2a43b910ed5a46dba72153e2cc795b51b2.tar.gz | |
log_event.cc:
post-conflict-merge fix (duplicate comment)
sql/log_event.cc:
post-conflict-merge fix (duplicate comment)
| -rw-r--r-- | sql/log_event.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc index 31b02a5a29a..2fdc89504d7 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -1,5 +1,4 @@ /* Copyright (C) 2000-2004 MySQL AB -/* Copyright (C) 2000-2004 MySQL AB This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by |