Adaptation for embedded and electronic systems technologies. #700
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Sorry, I am a beginner with collaborative projects, how can I resolve the conflict? I have tried to fix it using the resolve conflicts button, but there's no function. |
|
Hey, @Manuel-Baez-Ponce! I think this article will help you.
|
|
@Ileriayo |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Added some images to use as emoji in the sections below.
Added the next sections with the principal technologies used in each one:
moved Arduino and Espressif from Other to Microcontrollers/Microprocessors.
moved Raspberry Pi from Other to Single Board Computers.
added TinyML in ML/DL section.
added LabVIEW, MatLab and MicroPython in Languages section.