From 445ba10f7cb8e4c4b14cd668f429315fe236953b Mon Sep 17 00:00:00 2001
From: Patrick Musau <pmusau13ster@gmail.com>
Date: Tue, 29 Jun 2021 10:59:45 -0500
Subject: [PATCH] revert back

---
 camera_calibration/pytest.ini | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/camera_calibration/pytest.ini b/camera_calibration/pytest.ini
index 170c18d95..fe55d2ed6 100644
--- 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