merge conflict test

garrettwrong · garrettwrong · commit 393b089b80a8 · 2024-08-26T14:35:09.000-04:00
diff --git a/tests/test_volume.py b/tests/test_volume.py
@@ -589,7 +589,7 @@ def test_downsample(res):
     # Confirm the pixel size is scaled
     np.testing.assert_approx_equal(
         result.pixel_size,
-        vols.pixel_size * res / ds_res,
+        vols.pixel_size * og_res / ds_res,
         err_msg="Incorrect pixel size.",
     )
 

Original file line number	Diff line number	Diff line change
`@@ -589,7 +589,7 @@ def test_downsample(res):`
`589`	`589`	`# Confirm the pixel size is scaled`
`590`	`590`	`np.testing.assert_approx_equal(`
`591`	`591`	`result.pixel_size,`
`592`		`- vols.pixel_size * res / ds_res,`
	`592`	`+ vols.pixel_size * og_res / ds_res,`
`593`	`593`	`err_msg="Incorrect pixel size.",`
`594`	`594`	`)`
`595`	`595`