From 5eba071accd534c59dd46c9fe192e75c3bac0f00 Mon Sep 17 00:00:00 2001
From: Ben Arc <ben@arc.wales>
Date: Mon, 12 Apr 2021 17:35:57 +0100
Subject: [PATCH] Updated pip

---
 Pipfile | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/Pipfile b/Pipfile
index 5d7343ee..e98361c4 100644
--- a/Pipfile
+++ b/Pipfile
@@ -24,12 +24,9 @@ quart-trio = "*"
 trio = "==0.16.0"
 hypercorn = {extras = ["trio"], version = "*"}
 sqlalchemy-aio = "*"
-<<<<<<< HEAD
 embit = "*"
-=======
 pyqrcode = "*"
 pypng = "*"
->>>>>>> master
 
 [dev-packages]
 black = "==20.8b1"