From bad7a4b7a4b8608c68f0c13c6dda6316165ad29e Mon Sep 17 00:00:00 2001
From: "wenjie.luo" <932873781@qq.com>
Date: Wed, 10 Nov 2021 02:43:30 +0000
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6=E8=87=B3?=
 =?UTF-8?q?=20''?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .browserslistrc |  3 +++
 .gitignore      | 23 +++++++++++++++++++++++
 .prettierrc     |  6 ++++++
 LICENSE         | 23 +++++++++++++++++++++++
 babel.config.js |  8 ++++++++
 5 files changed, 63 insertions(+)
 create mode 100644 .browserslistrc
 create mode 100644 .gitignore
 create mode 100644 .prettierrc

diff --git a/.browserslistrc b/.browserslistrc
new file mode 100644
index 0000000..8e8f537
--- /dev/null
+++ b/.browserslistrc
@@ -0,0 +1,3 @@
+> 1%
+last 2 versions
+not ie <= 8
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..d325177
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,23 @@
+.DS_Store
+node_modules
+/dist
+example.html
+favicon.ico
+或然服务端
+# local env files
+.env.local
+.env.*.local
+
+# Log files
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# Editor directories and files
+.idea
+.vscode
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw*
diff --git a/.prettierrc b/.prettierrc
new file mode 100644
index 0000000..fafbfb2
--- /dev/null
+++ b/.prettierrc
@@ -0,0 +1,6 @@
+{
+	"tabWidth": 4,
+	"singleQuote": true,
+	"trailingComma": "none",
+	"printWidth": 140
+}
\ No newline at end of file
diff --git a/LICENSE b/LICENSE
index 05bd996..878e982 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 MIT License
 
 Copyright (c) 2016-2019 vue-manage-system
@@ -18,4 +19,26 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+=======
+MIT License
+
+Copyright (c) 2016-2019 vue-manage-system
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+>>>>>>> f00fa22... initial
 SOFTWARE.
\ No newline at end of file
diff --git a/babel.config.js b/babel.config.js
index c8e69f5..c7231d7 100644
--- a/babel.config.js
+++ b/babel.config.js
@@ -1,5 +1,13 @@
+<<<<<<< HEAD
 module.exports = {
   presets: [
     '@vue/app'
   ]
 }
+=======
+module.exports = {
+  presets: [
+    '@vue/app'
+  ]
+}
+>>>>>>> f00fa22... initial