Commits

Anders Lehmann  committed 8fd6ebf Merge

Merged

  • Participants
  • Parent commits 23e284e, a75e7b8

Comments (0)

Files changed (1)

File src/usernames/names.txt

 Anders Lehmann : EBSD2
-Kristian Rahbek: rahbek1
+<<<<<<< local
+Kristian Rahbek: rahbek1=======
+Lars Juhl-Nielsen: ljuhlnielsen
+>>>>>>> other