removed duplicate info from merge conflict
[libreplanet-static.git] / 2017 / program /
drwxr-xr-x   ..
-rw-r--r-- 40582 generated-bios.html
-rw-r--r-- 3592 generated-sessions.html
-rwxr-xr-x 677 index.html
-rwxr-xr-x 682 speakers.html