From d5a90ca8ae778732c7de4519a771477faefcefdc Mon Sep 17 00:00:00 2001
From: mattmcw <matt@sixteenmillimeter.com>
Date: Mon, 14 Nov 2022 13:43:58 -0500
Subject: [PATCH] Fixed?

---
 fourcell/normalize.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/fourcell/normalize.py b/fourcell/normalize.py
index e2dc914..778644a 100644
--- a/fourcell/normalize.py
+++ b/fourcell/normalize.py
@@ -398,8 +398,4 @@ cv2.rectangle(blank, offset, (offset[0]+meanRect[0], offset[1]+meanRect[1]), (25
 
 #normal = place(blank, rotated, 0, 0)
 
-<<<<<<< Updated upstream
-display(blank)
-=======
-display(blank)
->>>>>>> Stashed changes
+