Merge branch 'master' of ssh://c4science.ch/diffusion/9482/sp4e_homework_ashtari_sieber
Description
Description
Details
Details
- Committed
sieber Oct 29 2019, 15:07 - Pushed
sieber Oct 29 2019, 15:07 - Parents
- R9482:5310d3649314: minor changes
R9482:f50b0f546d7d: Conflict resolution - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| f50b0f546d7d | ashtari | Conflict resolution | Oct 29 2019 | |||
| c0ecd784dee5 | ashtari | Conflict resolution | Oct 29 2019 | |||
| 847a8b9f2282 | ashtari | Tiniy modification in PrientSeries | Oct 29 2019 | |||
| dec20ea1a90c | ashtari | Tiniy modification in PrientSeries | Oct 29 2019 |