MDEV-28478 fixup: Remove a conflict marker

fd9e733a · Marko Mäkelä · 26d46234 · fd9e733a
Commit fd9e733a authored May 06, 2022 by Marko Mäkelä
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 6 deletions

storage/innobase/gis/gis0rtree.cc storage/innobase/gis/gis0rtree.cc +0 -6

No files found.
--- a/storage/innobase/gis/gis0rtree.cc
+++ b/storage/innobase/gis/gis0rtree.cc
 /*****************************************************************************

 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