Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

M gfromthe5031/issue143 #194

Draft
wants to merge 15 commits into
base: main
Choose a base branch
from

Conversation

mGFROMTHE5031
Copy link

No description provided.

Mgfromthe503 and others added 15 commits April 13, 2023 12:20
…5031/JARVIS.git into mGFROMTHE5031/issue143

* 'mGFROMTHE5031/issue138' of https://github.com/mGFROMTHE5031/JARVIS.git:
  FileNotFoundError: [WinError 3] The system cannot find the path specified: Fixes microsoft#138
  FileNotFoundError: [WinError 3] The system cannot find the path specified: Fixes microsoft#138
  FileNotFoundError: [WinError 3] The system cannot find the path specified: Fixes microsoft#138

# Conflicts:
#	.gitignore
#	.vscode/launch.json
#	web/src/assets/clip.svg
#	web/src/assets/huggingface.svg
#	web/src/assets/setting.svg
…5031/JARVIS.git into mGFROMTHE5031/issue143

* 'mGFROMTHE5031/issue138' of https://github.com/mGFROMTHE5031/JARVIS.git:
  FileNotFoundError: [WinError 3] The system cannot find the path specified: Fixes microsoft#138
  FileNotFoundError: [WinError 3] The system cannot find the path specified: Fixes microsoft#138
  FileNotFoundError: [WinError 3] The system cannot find the path specified: Fixes microsoft#138

# Conflicts:
#	.gitignore
#	.vscode/launch.json
#	web/src/assets/clip.svg
#	web/src/assets/huggingface.svg
#	web/src/assets/setting.svg

Signed-off-by: mindy gaines <mindy.gaines1@gmail.com>
…to mGFROMTHE5031/issue143

* 'main' of https://github.com/mGFROMTHE5031/JARVIS.git:
  634bc94
  Revert "Migrate code to modern es6 syntax (microsoft#124)" (microsoft#147)

# Conflicts:
#	.vscode/launch.json
#	.vscode/tasks.json
#	web/src/views/home.vue

Signed-off-by: mindy gaines <mindy.gaines1@gmail.com>
…to mGFROMTHE5031/issue143

* 'main' of https://github.com/mGFROMTHE5031/JARVIS.git:
  634bc94
  Revert "Migrate code to modern es6 syntax (microsoft#124)" (microsoft#147)

# Conflicts:
#	.vscode/launch.json
#	.vscode/tasks.json
#	web/src/views/home.vue

Signed-off-by: mindy gaines <mindy.gaines1@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants