Skip to content

M
MariaDB
Commit fd9e733a authored by Marko Mäkelä's avatar Marko Mäkelä
Browse files
Options

MDEV-28478 fixup: Remove a conflict marker

parent 26d46234
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 6 deletions
storage/innobase/gis/gis0rtree.cc
View file @ fd9e733a
/***************************************************************************** /*****************************************************************************
Copyright (c) 2016, Oracle and/or its affiliates. All Rights Reserved. Copyright (c) 2016, Oracle and/or its affiliates. All Rights Reserved.
<<<<<<< HEAD
Copyright (c) 2018, 2021, MariaDB Corporation.
||||||| parent of 20ae4816bba (MDEV-28478: INSERT into SPATIAL INDEX in TEMPORARY table writes log)
Copyright (c) 2019, 2020, MariaDB Corporation.
=======
Copyright (c) 2019, 2022, MariaDB Corporation. Copyright (c) 2019, 2022, MariaDB Corporation.
>>>>>>> 20ae4816bba (MDEV-28478: INSERT into SPATIAL INDEX in TEMPORARY table writes log)
This program is free software; you can redistribute it and/or modify it under 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 the Free Software the terms of the GNU General Public License as published by the Free Software
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7