- Legacy-Id: 13981

This commit is contained in:
Henrik Levkowetz 2017-07-26 21:34:29 +00:00
parent 896fb3d098
commit 73c4a7b397

View file

@ -1,5 +1,6 @@
# -*- conf-mode -*-
/personal/sbirkholz/meeting_registration@13969 # manual branch merge
/personal/sbirkholz/meeting_registration@13954
/personal/sbirkholz/meeting_registration@13949
/personal/rcross/6.54.2.dev0@13632 # resolved differently in [13653]