Merge branch 'main' into refactor/data_kind

Author: seisman

pygmt/helpers/utils.py

@@ -229,25 +229,6 @@ def data_kind(  # noqa: PLR0911
 
     Examples
     --------
-    <<<<<<< HEAD
-    >>> import numpy as np
-    >>> import xarray as xr
-    >>> import pandas as pd
-    >>> import pathlib
-    >>> import io
-    >>> data_kind(data=None)
-    'none'
-    >>> data_kind(data=None, required=False)
-    'arg'
-    >>> [data_kind(data=data) for data in (2, 2.0, True, False)]
-    ['arg', 'arg', 'arg', 'arg']
-    >>> data_kind(data="my-data-file.txt")
-    'file'
-    >>> data_kind(data=pathlib.Path("my-data-file.txt"))
-    'file'
-    >>> data_kind(data=["data1.txt", "data2.txt"])
-    'file'
-    >>> data_kind(data=xr.DataArray(np.random.rand(4, 3)))
     >>> import io
     >>> from pathlib import Path
     >>> import numpy as np