Resolves conflicts with master branch

Browse Source

# Conflicts:
#	AltStore/Model/DatabaseManager.swift
#	Shared/Extensions/Bundle+AltStore.swift

...

This commit is contained in:

Riley Testut

2020-11-11 13:04:24 -08:00

parent 0d06e028cd 846b2c16d1

commit a94a6b3f4b

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available