fix: remove conflict

.pytest_cache/.gitignore

@@ -1,2 +0,0 @@
-# Created by pytest automatically.
-*

.pytest_cache/CACHEDIR.TAG

@@ -1,4 +0,0 @@
-Signature: 8a477f597d28d172789f06886806bc55
-# This file is a cache directory tag created by pytest.
-# For information about cache directory tags, see:
-#	https://bford.info/cachedir/spec.html

.pytest_cache/README.md

@@ -1,8 +0,0 @@
-# pytest cache directory #
-
-This directory contains data from the pytest's cache plugin,
-which provides the `--lf` and `--ff` options, as well as the `cache` fixture.
-
-**Do not** commit this to version control.
-
-See [the docs](https://docs.pytest.org/en/stable/how-to/cache.html) for more information.

.pytest_cache/v/cache/lastfailed

@@ -1,4 +0,0 @@
-{
-  "tests/unittest/test_unit.py": true,
-  "tests/unittest/test_table/test_tablemaster.py": true
-}

.pytest_cache/v/cache/nodeids

@@ -1 +0,0 @@
-[]

.pytest_cache/v/cache/stepwise

@@ -1 +0,0 @@
-[]