diff options
| author | Nick Brassel <nick@tzarc.org> | 2023-03-30 08:40:35 +1100 |
|---|---|---|
| committer | Nick Brassel <nick@tzarc.org> | 2023-03-30 08:40:35 +1100 |
| commit | c0a24671eeef227a8554fe1c78656958bfb7f6d8 (patch) | |
| tree | 61e693a1e8326fd9dba4b72fa54ad0f29aa741ec /data/mappings/info_config.hjson | |
| parent | 836ffabc3d2d2f3ff0c7bccf747c520853f94425 (diff) | |
Actually commit conflict resolution.
Diffstat (limited to 'data/mappings/info_config.hjson')
0 files changed, 0 insertions, 0 deletions