From 0f2bbd1a1649b4536bd3410ed70b4604a491f1f9 Mon Sep 17 00:00:00 2001
From: Arthur Lu <learthurgo@gmail.com>
Date: Mon, 18 May 2020 15:44:39 -0500
Subject: [PATCH] more fixes

Signed-off-by: Arthur Lu <learthurgo@gmail.com>
---
 data-analysis/unit-test.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/data-analysis/unit-test.py b/data-analysis/unit-test.py
index 0b32981d..d2a8f744 100644
--- a/data-analysis/unit-test.py
+++ b/data-analysis/unit-test.py
@@ -1,2 +1 @@
-<<<<<<< HEAD
 assert True == True
\ No newline at end of file