summaryrefslogtreecommitdiffstats
path: root/application/resources/iOS/index.theme
diff options
context:
space:
mode:
authorThomas Groman <tgroman@nuegia.net>2019-09-19 00:50:16 -0700
committerThomas Groman <tgroman@nuegia.net>2019-09-19 00:50:16 -0700
commit4c27a7cbe5f994b0616189e67042bc51c79c2547 (patch)
tree6387ebc826f799968e6b35e8ac336e0cca19bdad /application/resources/iOS/index.theme
parent32b3ed0a1362a4b0798ad71fac3450fb77cb7e41 (diff)
downloadMultiMC-4c27a7cbe5f994b0616189e67042bc51c79c2547.tar
MultiMC-4c27a7cbe5f994b0616189e67042bc51c79c2547.tar.gz
MultiMC-4c27a7cbe5f994b0616189e67042bc51c79c2547.tar.lz
MultiMC-4c27a7cbe5f994b0616189e67042bc51c79c2547.tar.xz
MultiMC-4c27a7cbe5f994b0616189e67042bc51c79c2547.zip
cleaned up leftover merge conflict
Diffstat (limited to 'application/resources/iOS/index.theme')
0 files changed, 0 insertions, 0 deletions