test 冲突

14e22cd7 · shangbj · 2494f414 · 14e22cd7 · 14e22cd7 · 14e22cd7
Commit 14e22cd7 authored Mar 14, 2020 by shangbj
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

.gitignore .gitignore +1 -1

package.json package.json +0 -1

test.js test.js +1 -0

No files found.
--- a/.gitignore
+++ b/.gitignore
--- a/package.json
+++ b/package.json
@@ -12,7 +12,6 @@
  },
  "husky": {
    "hooks": {
-      // "pre-commit": "node ./build/hooks.js",
      "commit-msg": "node ./build/hooks.js"
    }
  },

--- a/test.js
+++ b/test.js
+<<<<<<< HEAD
\ No newline at end of file