From 3f4730c610e5e3338c6762f440ebeb3d80379124 Mon Sep 17 00:00:00 2001
From: Travis Rivers <trivers@contractor.usgs.gov>
Date: Thu, 9 Apr 2020 13:45:01 -0600
Subject: [PATCH] pip
---
Pipfile.lock | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/Pipfile.lock b/Pipfile.lock
index 910089f4..1b53fef9 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -1,8 +1,12 @@
{
"_meta": {
"hash": {
+<<<<<<< HEAD
<<<<<<< HEAD
"sha256": "809e5e04e4d1957e08e475b75c4c425c1b63b7d1fdaee30e79b077e84e115504"
+=======
+ "sha256": "9d11130b39f605d10cd4d32c8b721e21b38cdbae4b5eaf19f794d6181184a08c"
+>>>>>>> pip
=======
"sha256": "9d11130b39f605d10cd4d32c8b721e21b38cdbae4b5eaf19f794d6181184a08c"
>>>>>>> pip
--
GitLab