Fix conflict
[akkoma] / lib / pleroma / web / templates / o_auth / o_auth /
drwxr-xr-x   ..
-rw-r--r-- 957 _scopes.html.eex
-rw-r--r-- 629 consumer.html.eex
-rw-r--r-- 1314 register.html.eex
-rw-r--r-- 75 results.html.eex
-rw-r--r-- 1608 show.html.eex