Daniel Lee bc5fae5367 dashfolders: merge conflict %!s(int64=8) %!d(string=hai) anos
..
settings.html bc5fae5367 dashfolders: merge conflict %!s(int64=8) %!d(string=hai) anos
settings.ts bc5fae5367 dashfolders: merge conflict %!s(int64=8) %!d(string=hai) anos