From fb36bc2a43b910ed5a46dba72153e2cc795b51b2 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 19 Nov 2004 00:57:26 +0100 Subject: [PATCH] log_event.cc: post-conflict-merge fix (duplicate comment) sql/log_event.cc: post-conflict-merge fix (duplicate comment) --- sql/log_event.cc | 1 - 1 file changed, 1 deletion(-) 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,4 +1,3 @@ -/* Copyright (C) 2000-2004 MySQL AB /* Copyright (C) 2000-2004 MySQL AB This program is free software; you can redistribute it and/or modify