maxim.derksen/einfuehrung-git
1
0
Fork 0
forked from IF-LK-2020/einfuehrung-git
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of https://git.ngb.schule/IF-LK-2020/einfuehrung-git

Browse Source 
# Conflicts:
#	team.txt
This commit is contained in:
oliver.stankawitz
2020-08-20 10:40:29 +02:00
parent 29417cb02c ba38acdaff
commit ed44e30907
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
team.txt
View File

@@ -1,4 +1,7 @@
Ngb,J. Neugebauer,ngb@helmholtz-bi.de Ngb,J. Neugebauer,ngb@helmholtz-bi.de
Jan,Jan.Landwehrmann,jan.landwehrmann@outlook.de
=======
lex.hung, Hung, khachunglexschule@gmail.com lex.hung, Hung, khachunglexschule@gmail.com
simon.liebold,Simon Liebold,lieboldsimonpaul@gmail.com simon.liebold,Simon Liebold,lieboldsimonpaul@gmail.com
>>>>>>> 47d3701cadb75f624e7a35d3bb6de936e41506be
oliver.stankawitz,Oliver Stankawitz,oliver1011@gmx.de oliver.stankawitz,Oliver Stankawitz,oliver1011@gmx.de