diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-05-06 10:39:12 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-05-06 10:39:12 +0300 |
| commit | fd9e733aaaeada04eea215394208292753605517 (patch) | |
| tree | 8cdf65249c9055b91784be59be6c9475f33b3481 | |
| parent | 26d46234e8316c010d40c02654803aaa7deb370c (diff) | |
| download | mariadb-git-fd9e733aaaeada04eea215394208292753605517.tar.gz | |
MDEV-28478 fixup: Remove a conflict marker
| -rw-r--r-- | storage/innobase/gis/gis0rtree.cc | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/storage/innobase/gis/gis0rtree.cc b/storage/innobase/gis/gis0rtree.cc index 19e7003f1ea..b529d5ebef5 100644 --- a/storage/innobase/gis/gis0rtree.cc +++ b/storage/innobase/gis/gis0rtree.cc @@ -1,13 +1,7 @@ /***************************************************************************** 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. ->>>>>>> 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 the terms of the GNU General Public License as published by the Free Software |