Resolve merge conflict
[akkoma] / lib / pleroma / gopher /
drwxr-xr-x   ..
-rw-r--r-- 4325 server.ex