From 33961af3835671f8c58c49ad106ed078f6b79d12 Mon Sep 17 00:00:00 2001
From: slugb0t <wheresdorian@gmail.com>
Date: Thu, 5 Aug 2021 00:41:52 -0700
Subject: [PATCH] merge conflict resolved

---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index 69bc127..1916173 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1 @@
 # ecomm
->>>>>>> 537d9ae81ba916b760ba9d42dc139ba157b9e0eb