Skip to content

Commit 8766f2f

Browse files
vbrodskyVal Brodsky
authored andcommitted
[PLT-1492] Fix 'flaky' tests spotted during a prod run (#1846)
1 parent 3aa807a commit 8766f2f

File tree

1 file changed

+0
-9
lines changed

1 file changed

+0
-9
lines changed

libs/labelbox/tests/conftest.py

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,8 @@
22
import os
33
import re
44
import time
5-
<<<<<<< HEAD
65
import uuid
76
from datetime import datetime
8-
=======
9-
from labelbox.schema.project import Project
10-
import requests
11-
from labelbox.schema.ontology import Ontology
12-
import pytest
13-
from types import SimpleNamespace
14-
from typing import Type
15-
>>>>>>> 0bbd7c29 (Vb/fix ontology leaks plt 1379 (#1814))
167
from enum import Enum
178
from random import randint
189
from string import ascii_letters

0 commit comments

Comments
 (0)