diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2017-09-25 12:39:47 -0400 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2017-09-25 12:39:47 -0400 |
| commit | 65fc2615800fd4db985bb3fc07b5da8c52e33dec (patch) | |
| tree | 4d4c34a46222bb3cf29779618a0e0bf4219c92df /package-lock.json | |
| parent | 9006a2d713279f4b624df2d94055a591112b055b (diff) | |
| parent | 5e75a4a4326c3d9e67041ccc133bf7397144f262 (diff) | |
commit conflicts resolve
Diffstat (limited to 'package-lock.json')
| -rw-r--r-- | package-lock.json | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/package-lock.json b/package-lock.json index bea4aa8d..6ef854ca 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,4 @@ { - "name": "zmninja", "version": "1.0.0", "lockfileVersion": 1, "requires": true, |