More conflict resolution

tanujjain · tanujjain · commit f2af24543b20 · 2025-05-15T16:54:18.000+02:00
diff --git a/imagededup/__init__.py b/imagededup/__init__.py
@@ -1,5 +1 @@
-<<<<<<< HEAD
-__version__ = '0.3.2'
-=======
-__version__ = '0.3.3'
->>>>>>> master
+__version__ = '0.3.3'
diff --git a/tests/test_cnn.py b/tests/test_cnn.py
@@ -892,12 +892,8 @@ def test_find_duplicates_encoding_integration(cnn):
     }
 
     encodings = cnn.encode_images(TEST_IMAGE_DIR_MIXED)
-<<<<<<< HEAD
     with warnings.catch_warnings():
         warnings.simplefilter("ignore")
-=======
-    with pytest.warns():
->>>>>>> master
         duplicates = cnn.find_duplicates(
             encoding_map=encodings, min_similarity_threshold=0.9, scores=True, outfile=False
         )

Original file line number	Diff line number	Diff line change
`@@ -892,12 +892,8 @@ def test_find_duplicates_encoding_integration(cnn):`
`892`	`892`	`}`
`893`	`893`
`894`	`894`	`encodings = cnn.encode_images(TEST_IMAGE_DIR_MIXED)`
`895`		`-<<<<<<< HEAD`
`896`	`895`	`with warnings.catch_warnings():`
`897`	`896`	`warnings.simplefilter("ignore")`
`898`		`-=======`
`899`		`- with pytest.warns():`
`900`		`->>>>>>> master`
`901`	`897`	`duplicates = cnn.find_duplicates(`
`902`	`898`	`encoding_map=encodings, min_similarity_threshold=0.9, scores=True, outfile=False`
`903`	`899`	`)`