From 9dbccc98cb978be4eea0799bffccaf797db313c8 Mon Sep 17 00:00:00 2001
From: Ankush Menat <ankushmenat@gmail.com>
Date: Thu, 17 Nov 2022 16:47:42 +0530
Subject: [PATCH] chore: conflicts

---
 pyproject.toml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 3a468f966b..f5ab8c94b2 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -48,11 +48,7 @@ dependencies = [
     "premailer~=3.8.0",
     "psutil~=5.9.1",
     "psycopg2-binary~=2.9.1",
-<<<<<<< HEAD
-=======
-    "pyasn1~=0.4.8",
     "pyOpenSSL~=22.1.0",
->>>>>>> f70db1f539 (build: pin pyopenssl)
     "pycryptodome~=3.10.1",
     "pyotp~=2.6.0",
     "python-dateutil~=2.8.1",