DLE-190520-Merge conflicts

Anh-Duy Le · Anh-Duy Le · commit 579dd584b2ed · 2019-05-20T13:56:34.000+07:00
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,3 +1,3 @@
 {
-    "python.pythonPath": "Z:\\Program Files (x86)\\Python\\Python 3.7.2\\python.exe"
+    "python.pythonPath": "C:\\Program Files (x86)\\Python37-32\\python.exe"
 }

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`{`
`2`		`- "python.pythonPath": "Z:\\Program Files (x86)\\Python\\Python 3.7.2\\python.exe"`
	`2`	`+ "python.pythonPath": "C:\\Program Files (x86)\\Python37-32\\python.exe"`
`3`	`3`	`}`