Merge branch 'master' of https://github.com/Rail-ZongZi/BuildTools

zhongzi-rail0039 · zhongzi-rail0039 · commit 468d415195ba · 2020-03-08T00:02:53.000+08:00
# Conflicts:
#	package.json
diff --git a/README.md b/README.md
@@ -1,2 +1,3 @@
-# BuildTools
-包含前端一些常见的构建工具与工程化与自动化
+### webpack4版本学习
+
+> 
diff --git a/package.json b/package.json
@@ -1,10 +1,10 @@
 {
   "name": "demo01",
   "version": "1.0.0",
-  "description": "包含前端一些常见的构建工具与工程化与自动化",
+  "description": ">",
   "main": "index.js",
   "scripts": {
-    "dev": ""
+    "test": "echo \"Error: no test specified\" && exit 1"
   },
   "repository": {
     "type": "git",
diff --git a/src/index.html b/src/index.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport"
+          content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <title>Title</title>
+</head>
+<body>
+
+</body>
+</html>
