diff options
| author | multiple creatures <dev@multiple-creature.party> | 2020-02-21 00:07:34 -0600 |
|---|---|---|
| committer | multiple creatures <dev@multiple-creature.party> | 2020-02-21 00:07:34 -0600 |
| commit | c600f16baf66fac26ba40c0d3d4df46a822ede89 (patch) | |
| tree | 5a7711c51ab5bfdd0c575bbe1a4e08e53629020b /app/controllers/settings | |
| parent | 7d5c8ef95279cdc4b8c9a4f2f0f9a25584810edb (diff) | |
resolve stray merge conflict
Diffstat (limited to 'app/controllers/settings')
0 files changed, 0 insertions, 0 deletions