From a66f6328d13abe7cd93924feacf6c1c8bbcfb4e9 Mon Sep 17 00:00:00 2001 From: Claude Meny Date: Tue, 18 Aug 2020 21:30:58 +0200 Subject: [PATCH] Update textbook.es.md --- .../03.presentar_el_proyecto/textbook.es.md | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/00.brainstorming-pedagogical-teams/03.presentar_el_proyecto/textbook.es.md b/00.brainstorming-pedagogical-teams/03.presentar_el_proyecto/textbook.es.md index f3cdd21c9..d9abc37ce 100644 --- a/00.brainstorming-pedagogical-teams/03.presentar_el_proyecto/textbook.es.md +++ b/00.brainstorming-pedagogical-teams/03.presentar_el_proyecto/textbook.es.md @@ -252,9 +252,13 @@ Prof2C -->|concerta|Prof1C Prof3C -->|concerta|Prof1C Prof3C -->|concerta|Prof2C Prof2C -->|concerta|Prof3C -Prof1A -->|merge|Valide -Prof1B -->|merge|Valide -Prof1C -->|merge|Valide +Prof1A -->|commit+merge|Valide +Prof1B -->|commit+merge|Valide +Prof1C -->|commit+merge|Valide +Prof2A -->|commit|Propone +Prof2C -->|commit|Propone +Prof3C -->|commit|Propone +Propone -->|commit|Valide ```