From fd9e733aaaeada04eea215394208292753605517 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= Date: Fri, 6 May 2022 10:39:12 +0300 Subject: MDEV-28478 fixup: Remove a conflict marker --- storage/innobase/gis/gis0rtree.cc | 6 ------ 1 file changed, 6 deletions(-) (limited to 'storage') 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 -- cgit v1.2.1