fixed merge conflict

deltachat-ios.xcodeproj/project.pbxproj

@@ -602,11 +602,8 @@
 				3059620D234614E700C80F33 /* DcContact+Extension.swift */,
 				3059620F2346154D00C80F33 /* String+Extension.swift */,
 				302B84CD2397F6CD001C261F /* URL+Extension.swift */,
-<<<<<<< HEAD
 				AE0AA957247834A400D42A7F /* Date+Extension.swift */,
-=======
 				AE6EC5232497663200A400E4 /* UIImageView+Extensions.swift */,
->>>>>>> thumbnails are generated on background thread + cached and restored from cache
 			);
 			path = Extensions;
 			sourceTree = "<group>";
@@ -947,11 +944,8 @@
 				AE1988A423EB2FBA00B4CD5F /* Errors.swift */,
 				AEFBE23023FF09B20045327A /* TypeAlias.swift */,
 				307D822D241669C7006D2490 /* LocationManager.swift */,
-<<<<<<< HEAD
 				AE0AA9552478191900D42A7F /* GridCollectionViewFlowLayout.swift */,
-=======
 				AE6EC5272497B9B200A400E4 /* ThumbnailCache.swift */,
->>>>>>> thumbnails are generated on background thread + cached and restored from cache
 			);
 			path = Helper;
 			sourceTree = "<group>";