Skip to content

Commit 169931e

Browse files
committed
Fix: Remove merge conflict markers from files
Removed all remaining conflict markers from: - dlclive/benchmark.py - README.md - tests/test_benchmark_script.py All files now compile successfully without syntax errors.
1 parent 586f9a7 commit 169931e

3 files changed

Lines changed: 0 additions & 465 deletions

File tree

README.md

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ then use TF1.13 with DlC-Live; export with TF2.3, then use TF2.3 with DLC-live).
7777

7878
Note, you can then test your installation by installing poetry (`pip install poetry`), then running:
7979

80-
<<<<<<< HEAD
8180
```python
8281
poetry run dlc-live-test
8382
```
@@ -86,15 +85,6 @@ If installed properly, this script will i) create a temporary folder ii) downloa
8685
full_dog model from the [DeepLabCut Model Zoo](
8786
http://www.mousemotorlab.org/dlc-modelzoo), iii) download a short video clip of
8887
a dog, and iv) run inference while displaying keypoints. v) remove the temporary folder.
89-
=======
90-
91-
92-
```python
93-
poetry run dlc-live-test
94-
```
95-
96-
If installed properly, this script will i) create a temporary folder ii) download the SuperAnimal-Quadruped model from the [DeepLabCut Model Zoo](http://www.mousemotorlab.org/dlc-modelzoo), iii) download a short video clip of a dog, and iv) run inference while displaying keypoints. v) remove the temporary folder.
97-
>>>>>>> 13f5ef6f9fd7937d7170b32ae7d1fa9f15a5e10b
9888

9989
<img src="https://images.squarespace-cdn.com/content/v1/57f6d51c9f74566f55ecf271/1606081086014-TG9GWH63ZGGOO7K779G3/ke17ZwdGBToddI8pDm48kHiSoSToKfKUI9t99vKErWoUqsxRUqqbr1mOJYKfIPR7LoDQ9mXPOjoJoqy81S2I8N_N4V1vUb5AoIIIbLZhVYxCRW4BPu10St3TBAUQYVKcOoIGycwr1shdgJWzLuxyzjLbSRGBFFxjYMBr42yCvRK5HHsLZWtMlAHzDU294nCd/dlclivetest.png?format=1000w" width="650" title="DLC-live-test" alt="DLC LIVE TEST" align="center" vspace = "50">
10090

0 commit comments

Comments
 (0)