From f502ea265ff2fe010a94011d24c4c5109657a80b Mon Sep 17 00:00:00 2001
From: Justin <justin.s.dalrymple@gmail.com>
Date: Tue, 5 May 2020 15:12:55 +0200
Subject: [PATCH] Fixing a merge conflict

---
 lerna.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lerna.json b/lerna.json
index 3d4c35d0..2e559f9d 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,4 +1,3 @@
-// prettier-ignore
 {
   "packages": [
     "packages/*"