Skip to content

Merge yuechen main#6

Merged
franpandol merged 6 commits intomainfrom
merge_yuechen_main
Jul 20, 2021
Merged

Merge yuechen main#6
franpandol merged 6 commits intomainfrom
merge_yuechen_main

Conversation

@franpandol
Copy link
Copy Markdown

@franpandol franpandol commented Jul 19, 2021

Fijense que dejé el último commit de Yue que hace un arreglo que me parece que es el mismo que hizo Santi.
Este commit de Yue daba conflictos YueChen-C@9243463 con el commit e67671a

@franpandol franpandol requested a review from ferrucho July 19, 2021 12:40
@franpandol franpandol merged commit c37b0db into main Jul 20, 2021
@franpandol franpandol deleted the merge_yuechen_main branch July 20, 2021 17:52
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.

3 participants