Commit Graph

11 Commits

Author SHA1 Message Date
Annemarie Galetzka ee3d933e39 merge conflict resolved 2020-01-29 15:31:30 +01:00
Annemarie Galetzka 9ac63a5d33 changes to file 2020-01-29 15:30:13 +01:00
hasan 439f80180c aanpassing op share file 2020-01-29 15:29:36 +01:00
Annemarie Galetzka 3ee326f972 added text to share.txt 2020-01-29 15:27:53 +01:00
Annemarie Galetzka 4963f9089d added share.txt 2020-01-29 15:23:45 +01:00
Annemarie Galetzka 0da0dab2ee Merge branch 'tak1' 2020-01-29 14:57:23 +01:00
Annemarie Galetzka c12ef21f3a thirdfile added to see diff in master and tak1 2020-01-29 14:54:01 +01:00
Annemarie Galetzka b50105ac45 edited secondfile to tak1 2020-01-29 14:48:16 +01:00
Annemarie Galetzka 2a22cfdeb0 secondfile added 2020-01-29 14:46:08 +01:00
Annemarie Galetzka 127a76ab41 readme + newfile 2020-01-29 14:28:54 +01:00
A. Galetzka da2b9d726b Initial commit 2020-01-29 13:16:21 +00:00