Resolve merge conflicts

Haneke / HanekeSwift

A lightweight generic cache for iOS written in Swift with extra love for images.

Apache License 2.0

5.2k stars 591 forks source link

Closed andrewcampoli closed 6 years ago