Commits

Anders Lehmann committed 8fd6ebf Merge

Merged

Comments (0)

Files changed (1)

src/usernames/names.txt

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