chore: merge conflicts

algorandfoundation · Dec 6, 2023 · 620ccec · 620ccec
1 parent 7166b86
commit 620ccec
Show file tree

Hide file tree

Showing 23 changed files with 42 additions and 157 deletions.
diff --git a/tests_generated/test_default_parameters/.vscode/extensions.json b/tests_generated/test_default_parameters/.vscode/extensions.json
@@ -1,14 +1,9 @@
 {
   "recommendations": [
     "ms-python.python",
-<<<<<<< HEAD
-    "bungcip.better-toml",
-    "editorconfig.editorconfig",
-    "vsls-contrib.codetour"
-=======
     "ms-python.black-formatter",
     "tamasfe.even-better-toml",
-    "editorconfig.editorconfig"
->>>>>>> main
+    "editorconfig.editorconfig",
+    "vsls-contrib.codetour"
   ]
 }
diff --git a/tests_generated/test_deployment_language-python/.vscode/extensions.json b/tests_generated/test_deployment_language-python/.vscode/extensions.json
@@ -1,14 +1,9 @@
 {
   "recommendations": [
     "ms-python.python",
-<<<<<<< HEAD
-    "bungcip.better-toml",
-    "editorconfig.editorconfig",
-    "vsls-contrib.codetour"
-=======
     "ms-python.black-formatter",
     "tamasfe.even-better-toml",
-    "editorconfig.editorconfig"
->>>>>>> main
+    "editorconfig.editorconfig",
+    "vsls-contrib.codetour"
   ]
 }
diff --git a/tests_generated/test_deployment_language-typescript/.vscode/extensions.json b/tests_generated/test_deployment_language-typescript/.vscode/extensions.json
@@ -3,13 +3,8 @@
     "ms-python.python",
     "ms-python.black-formatter",
     "esbenp.prettier-vscode",
-<<<<<<< HEAD
-    "bungcip.better-toml",
+    "tamasfe.even-better-toml",
     "editorconfig.editorconfig",
     "vsls-contrib.codetour"
-=======
-    "tamasfe.even-better-toml",
-    "editorconfig.editorconfig"
->>>>>>> main
   ]
 }
diff --git a/tests_generated/test_ide_jetbrains-False/.vscode/extensions.json b/tests_generated/test_ide_jetbrains-False/.vscode/extensions.json
@@ -1,14 +1,9 @@
 {
   "recommendations": [
     "ms-python.python",
-<<<<<<< HEAD
-    "bungcip.better-toml",
-    "editorconfig.editorconfig",
-    "vsls-contrib.codetour"
-=======
     "ms-python.black-formatter",
     "tamasfe.even-better-toml",
-    "editorconfig.editorconfig"
->>>>>>> main
+    "editorconfig.editorconfig",
+    "vsls-contrib.codetour"
   ]
 }
diff --git a/tests_generated/test_ide_jetbrains-True/.vscode/extensions.json b/tests_generated/test_ide_jetbrains-True/.vscode/extensions.json
@@ -1,14 +1,9 @@
 {
   "recommendations": [
     "ms-python.python",
-<<<<<<< HEAD
-    "bungcip.better-toml",
-    "editorconfig.editorconfig",
-    "vsls-contrib.codetour"
-=======
     "ms-python.black-formatter",
     "tamasfe.even-better-toml",
-    "editorconfig.editorconfig"
->>>>>>> main
+    "editorconfig.editorconfig",
+    "vsls-contrib.codetour"
   ]
 }
diff --git a/tests_generated/test_ide_vscode-True/.vscode/extensions.json b/tests_generated/test_ide_vscode-True/.vscode/extensions.json
@@ -1,14 +1,9 @@
 {
   "recommendations": [
     "ms-python.python",
-<<<<<<< HEAD
-    "bungcip.better-toml",
-    "editorconfig.editorconfig",
-    "vsls-contrib.codetour"
-=======
     "ms-python.black-formatter",
     "tamasfe.even-better-toml",
-    "editorconfig.editorconfig"
->>>>>>> main
+    "editorconfig.editorconfig",
+    "vsls-contrib.codetour"
   ]
 }
diff --git a/tests_generated/test_preset_name-production/.vscode/extensions.json b/tests_generated/test_preset_name-production/.vscode/extensions.json
@@ -3,14 +3,9 @@
     "ms-python.python",
     "charliermarsh.ruff",
     "matangover.mypy",
-<<<<<<< HEAD
-    "bungcip.better-toml",
-    "editorconfig.editorconfig",
-    "vsls-contrib.codetour"
-=======
     "ms-python.black-formatter",
     "tamasfe.even-better-toml",
-    "editorconfig.editorconfig"
->>>>>>> main
+    "editorconfig.editorconfig",
+    "vsls-contrib.codetour"
   ]
 }
diff --git a/tests_generated/test_preset_name-starter/.vscode/extensions.json b/tests_generated/test_preset_name-starter/.vscode/extensions.json
@@ -1,14 +1,9 @@
 {
   "recommendations": [
     "ms-python.python",
-<<<<<<< HEAD
-    "bungcip.better-toml",
-    "editorconfig.editorconfig",
-    "vsls-contrib.codetour"
-=======
     "ms-python.black-formatter",
     "tamasfe.even-better-toml",
-    "editorconfig.editorconfig"
->>>>>>> main
+    "editorconfig.editorconfig",
+    "vsls-contrib.codetour"
   ]
 }
diff --git a/tests_generated/test_python_linter-flake8/.vscode/extensions.json b/tests_generated/test_python_linter-flake8/.vscode/extensions.json
@@ -2,14 +2,9 @@
   "recommendations": [
     "ms-python.python",
     "ms-python.flake8",
-<<<<<<< HEAD
-    "bungcip.better-toml",
-    "editorconfig.editorconfig",
-    "vsls-contrib.codetour"
-=======
     "ms-python.black-formatter",
     "tamasfe.even-better-toml",
-    "editorconfig.editorconfig"
->>>>>>> main
+    "editorconfig.editorconfig",
+    "vsls-contrib.codetour"
   ]
 }
diff --git a/tests_generated/test_python_linter-none/.vscode/extensions.json b/tests_generated/test_python_linter-none/.vscode/extensions.json
@@ -1,14 +1,9 @@
 {
   "recommendations": [
     "ms-python.python",
-<<<<<<< HEAD
-    "bungcip.better-toml",
-    "editorconfig.editorconfig",
-    "vsls-contrib.codetour"
-=======
     "ms-python.black-formatter",
     "tamasfe.even-better-toml",
-    "editorconfig.editorconfig"
->>>>>>> main
+    "editorconfig.editorconfig",
+    "vsls-contrib.codetour"
   ]
 }
diff --git a/tests_generated/test_python_linter-ruff/.vscode/extensions.json b/tests_generated/test_python_linter-ruff/.vscode/extensions.json
@@ -2,14 +2,9 @@
   "recommendations": [
     "ms-python.python",
     "charliermarsh.ruff",
-<<<<<<< HEAD
-    "bungcip.better-toml",
-    "editorconfig.editorconfig",
-    "vsls-contrib.codetour"
-=======
     "ms-python.black-formatter",
     "tamasfe.even-better-toml",
-    "editorconfig.editorconfig"
->>>>>>> main
+    "editorconfig.editorconfig",
+    "vsls-contrib.codetour"
   ]
 }
diff --git a/...ed/test_smart_contract_generator_default_production_preset_python/.vscode/extensions.json b/...ed/test_smart_contract_generator_default_production_preset_python/.vscode/extensions.json
@@ -3,14 +3,9 @@
     "ms-python.python",
     "charliermarsh.ruff",
     "matangover.mypy",
-<<<<<<< HEAD
-    "bungcip.better-toml",
-    "editorconfig.editorconfig",
-    "vsls-contrib.codetour"
-=======
     "ms-python.black-formatter",
     "tamasfe.even-better-toml",
-    "editorconfig.editorconfig"
->>>>>>> main
+    "editorconfig.editorconfig",
+    "vsls-contrib.codetour"
   ]
 }
diff --git a/...est_smart_contract_generator_default_production_preset_typescript/.vscode/extensions.json b/...est_smart_contract_generator_default_production_preset_typescript/.vscode/extensions.json
@@ -5,13 +5,8 @@
     "matangover.mypy",
     "ms-python.black-formatter",
     "esbenp.prettier-vscode",
-<<<<<<< HEAD
-    "bungcip.better-toml",
+    "tamasfe.even-better-toml",
     "editorconfig.editorconfig",
     "vsls-contrib.codetour"
-=======
-    "tamasfe.even-better-toml",
-    "editorconfig.editorconfig"
->>>>>>> main
   ]
 }
diff --git a/...rated/test_smart_contract_generator_default_starter_preset_python/.vscode/extensions.json b/...rated/test_smart_contract_generator_default_starter_preset_python/.vscode/extensions.json
@@ -1,14 +1,9 @@
 {
   "recommendations": [
     "ms-python.python",
-<<<<<<< HEAD
-    "bungcip.better-toml",
-    "editorconfig.editorconfig",
-    "vsls-contrib.codetour"
-=======
     "ms-python.black-formatter",
     "tamasfe.even-better-toml",
-    "editorconfig.editorconfig"
->>>>>>> main
+    "editorconfig.editorconfig",
+    "vsls-contrib.codetour"
   ]
 }
diff --git a/...d/test_smart_contract_generator_default_starter_preset_typescript/.vscode/extensions.json b/...d/test_smart_contract_generator_default_starter_preset_typescript/.vscode/extensions.json
@@ -3,13 +3,8 @@
     "ms-python.python",
     "ms-python.black-formatter",
     "esbenp.prettier-vscode",
-<<<<<<< HEAD
-    "bungcip.better-toml",
+    "tamasfe.even-better-toml",
     "editorconfig.editorconfig",
     "vsls-contrib.codetour"
-=======
-    "tamasfe.even-better-toml",
-    "editorconfig.editorconfig"
->>>>>>> main
   ]
 }
diff --git a/tests_generated/test_use_github_actions-False/.vscode/extensions.json b/tests_generated/test_use_github_actions-False/.vscode/extensions.json
@@ -1,14 +1,9 @@
 {
   "recommendations": [
     "ms-python.python",
-<<<<<<< HEAD
-    "bungcip.better-toml",
-    "editorconfig.editorconfig",
-    "vsls-contrib.codetour"
-=======
     "ms-python.black-formatter",
     "tamasfe.even-better-toml",
-    "editorconfig.editorconfig"
->>>>>>> main
+    "editorconfig.editorconfig",
+    "vsls-contrib.codetour"
   ]
 }
diff --git a/tests_generated/test_use_github_actions-True/.vscode/extensions.json b/tests_generated/test_use_github_actions-True/.vscode/extensions.json
@@ -1,14 +1,9 @@
 {
   "recommendations": [
     "ms-python.python",
-<<<<<<< HEAD
-    "bungcip.better-toml",
-    "editorconfig.editorconfig",
-    "vsls-contrib.codetour"
-=======
     "ms-python.black-formatter",
     "tamasfe.even-better-toml",
-    "editorconfig.editorconfig"
->>>>>>> main
+    "editorconfig.editorconfig",
+    "vsls-contrib.codetour"
   ]
 }
diff --git a/tests_generated/test_use_python_black-False/.vscode/extensions.json b/tests_generated/test_use_python_black-False/.vscode/extensions.json
@@ -1,13 +1,8 @@
 {
   "recommendations": [
     "ms-python.python",
-<<<<<<< HEAD
-    "bungcip.better-toml",
+    "tamasfe.even-better-toml",
     "editorconfig.editorconfig",
     "vsls-contrib.codetour"
-=======
-    "tamasfe.even-better-toml",
-    "editorconfig.editorconfig"
->>>>>>> main
   ]
 }
diff --git a/tests_generated/test_use_python_black-True/.vscode/extensions.json b/tests_generated/test_use_python_black-True/.vscode/extensions.json
@@ -1,14 +1,9 @@
 {
   "recommendations": [
     "ms-python.python",
-<<<<<<< HEAD
-    "bungcip.better-toml",
-    "editorconfig.editorconfig",
-    "vsls-contrib.codetour"
-=======
     "ms-python.black-formatter",
     "tamasfe.even-better-toml",
-    "editorconfig.editorconfig"
->>>>>>> main
+    "editorconfig.editorconfig",
+    "vsls-contrib.codetour"
   ]
 }
diff --git a/tests_generated/test_use_python_mypy-False/.vscode/extensions.json b/tests_generated/test_use_python_mypy-False/.vscode/extensions.json
@@ -1,14 +1,9 @@
 {
   "recommendations": [
     "ms-python.python",
-<<<<<<< HEAD
-    "bungcip.better-toml",
-    "editorconfig.editorconfig",
-    "vsls-contrib.codetour"
-=======
     "ms-python.black-formatter",
     "tamasfe.even-better-toml",
-    "editorconfig.editorconfig"
->>>>>>> main
+    "editorconfig.editorconfig",
+    "vsls-contrib.codetour"
   ]
 }
diff --git a/tests_generated/test_use_python_mypy-True/.vscode/extensions.json b/tests_generated/test_use_python_mypy-True/.vscode/extensions.json
@@ -2,14 +2,9 @@
   "recommendations": [
     "ms-python.python",
     "matangover.mypy",
-<<<<<<< HEAD
-    "bungcip.better-toml",
-    "editorconfig.editorconfig",
-    "vsls-contrib.codetour"
-=======
     "ms-python.black-formatter",
     "tamasfe.even-better-toml",
-    "editorconfig.editorconfig"
->>>>>>> main
+    "editorconfig.editorconfig",
+    "vsls-contrib.codetour"
   ]
 }
diff --git a/tests_generated/test_use_python_pytest-False/.vscode/extensions.json b/tests_generated/test_use_python_pytest-False/.vscode/extensions.json
@@ -1,14 +1,9 @@
 {
   "recommendations": [
     "ms-python.python",
-<<<<<<< HEAD
-    "bungcip.better-toml",
-    "editorconfig.editorconfig",
-    "vsls-contrib.codetour"
-=======
     "ms-python.black-formatter",
     "tamasfe.even-better-toml",
-    "editorconfig.editorconfig"
->>>>>>> main
+    "editorconfig.editorconfig",
+    "vsls-contrib.codetour"
   ]
 }
diff --git a/tests_generated/test_use_python_pytest-True/.vscode/extensions.json b/tests_generated/test_use_python_pytest-True/.vscode/extensions.json
@@ -1,14 +1,9 @@
 {
   "recommendations": [
     "ms-python.python",
-<<<<<<< HEAD
-    "bungcip.better-toml",
-    "editorconfig.editorconfig",
-    "vsls-contrib.codetour"
-=======
     "ms-python.black-formatter",
     "tamasfe.even-better-toml",
-    "editorconfig.editorconfig"
->>>>>>> main
+    "editorconfig.editorconfig",
+    "vsls-contrib.codetour"
   ]
 }