From 0fa0c7a45c15df6207134719ea6dc5fb1d4bcac8 Mon Sep 17 00:00:00 2001
From: James Aguilar <799564+jaguilar@users.noreply.github.com>
Date: Fri, 4 May 2018 23:56:25 -0400
Subject: [PATCH] package-lock.json -> gitignore; merge minefield

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 8375e2318..9ec8810e2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ Changelog.txt
 Netburner.txt
 /node_modules
 /dist/*.map
+package-lock.json