Resolved merge conflict
Description
Description
Details
Details
- Committed
barjavel Nov 27 2018, 15:51 - Pushed
barjavel Nov 27 2018, 15:51 - Parents
- R7571:1e08d709c31e: Modifications done to G so that exercise 1 works
R7571:d743575e31af: pushing work during class - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| d743575e31af | Flavio Raschellà | pushing work during class | Nov 27 2018 | |||
| 372a678a570c | Flavio Raschellà | Merge branch 'master' of ssh://c4science.ch/diffusion/7571/sp-e-tb-tl | Nov 27 2018 | |||
| aa813f91bc7a | Flavio Raschellà | Merge branch 'master' of ssh://c4science.ch/source/sp4e | Nov 27 2018 |