marchboy
diff --git a/‎.gitignore
Lines changed: 4 additions & 10 deletions b/‎.gitignore
Lines changed: 4 additions & 10 deletions
diff --git a/‎.vs/slnx.sqlite
-80 KB b/‎.vs/slnx.sqlite
-80 KB
diff --git a/‎.vscode/ipch/b29e2b211abe6396/mmap_address.bin
-8 Bytes b/‎.vscode/ipch/b29e2b211abe6396/mmap_address.bin
-8 Bytes
diff --git a/‎.vscode/ipch/b29e2b211abe6396/text_analysis.ipch
-39.2 MB b/‎.vscode/ipch/b29e2b211abe6396/text_analysis.ipch
-39.2 MB
diff --git a/‎.vscode/ipch/ce65c9603e47c17d/c02-Menu2.ipch
-39.2 MB b/‎.vscode/ipch/ce65c9603e47c17d/c02-Menu2.ipch
-39.2 MB
diff --git a/‎.vscode/ipch/ce65c9603e47c17d/mmap_address.bin
-8 Bytes b/‎.vscode/ipch/ce65c9603e47c17d/mmap_address.bin
-8 Bytes
diff --git a/‎.vscode/settings.json
Lines changed: 3 additions & 2 deletions b/‎.vscode/settings.json
Lines changed: 3 additions & 2 deletions
diff --git a/‎0.jpg b/‎0.jpg
diff --git a/‎1.jpg b/‎1.jpg
diff --git a/‎c02-Menu2.cpp renamed to ‎C&CPp/c02-Menu2.cpp b/‎c02-Menu2.cpp renamed to ‎C&CPp/c02-Menu2.cpp
@@ -1,11 +1,5 @@
-# .vscode/
-<<<<<<< HEAD
-# .vscode/settings.json
-# settings.json
-=======
-.vscode/settings.json
-settings.json
-__pycache__
-__pycache__
+.vscode/
+#.vscode/settings.json
+#settings.json
+#__pycache__
 *.out
->>>>>>> 9ff99e0158cbe3beca5127f4ed6cbadb859b6fa5
@@ -1,4 +1,5 @@
 {
-    "python.pythonPath": "/usr/local/anaconda/bin/python",
-    "python.formatting.provider": "autopep8"
+    "python.pythonPath": "D:\\Program\\Python\\Python27\\python.exe",
+    "python.formatting.provider": "autopep8",
+    "python.linting.pylintEnabled": true
 }
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`{`
`2`		`- "python.pythonPath": "/usr/local/anaconda/bin/python",`
`3`		`- "python.formatting.provider": "autopep8"`
	`2`	`+ "python.pythonPath": "D:\\Program\\Python\\Python27\\python.exe",`
	`3`	`+ "python.formatting.provider": "autopep8",`
	`4`	`+ "python.linting.pylintEnabled": true`
`4`	`5`	`}`