removed duplicate info from merge conflict
[libreplanet-static.git] / 2017 / js-labels /
drwxr-xr-x   ..
-rwxr-xr-x 1900 index.html