revert back

ros-perception · Nov 12, 2021 · 445ba10 · 445ba10
1 parent 18becbb
commit 445ba10
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/camera_calibration/pytest.ini b/camera_calibration/pytest.ini
@@ -1,8 +1,2 @@
-<<<<<<< HEAD
 [pytest]
 junit_family=xunit2
-=======
-# pytest.ini
-[pytest]
-junit_family=xunit1
->>>>>>> update pytest.ini