From ce5b52d49ce4d9caf1e59c6722815b49d932b58b 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>
---
 unit-test.py | 1 -
 1 file changed, 1 deletion(-)

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