This repository has been archived by the owner on Jan 24, 2023. It is now read-only.
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.
Resolviendo conflictos #34
base: master
Are you sure you want to change the base?
Resolviendo conflictos #34
Changes from all commits
3dfdc7b
7b5bee3
70ed025
db676f5
b7495dc
9529866
2c8c50f
3d50ae8
ccc6a16
679d8eb
8d383d5
908cc2b
0981429
7872e70
94c209b
5c7960d
1d968b8
3f7cfa5
8998c0e
2022017
343a773
078ba14
e52b9c3
5bf542b
e56b80c
91bf7eb
2ccf166
dbaa8a4
4efa3fc
fee416a
12d9b96
171ef65
75c7007
208471c
8f979c3
bc57032
daa97b1
8daa60f
File filter
Filter by extension
Conversations
Jump to
There are no files selected for viewing