Merge branch 'master' of github.com:itwanger/toBeBetterJavaer

update .gitignore
xlyou · Apr 21, 2022 · aa1fc72 · aa1fc72
2 parents 5441b6f + 18256b0
commit aa1fc72
Show file tree

Hide file tree

Showing 67 changed files with 2,216 additions and 183 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,3 +5,8 @@ dist
 package-lock.json
 yarn.lock
 package.json
+<<<<<<< HEAD
+=======
+*.json
+package.json
+>>>>>>> 18256b0dac52cb2a6c0a07c2e3aae8a44c7a87ef