3 Commits

Author	SHA1	Message	Date
Alex Harker	83bf340492	Add .gitattributes (for cases where we do want to merge projects with less hassle)	2019-08-24 11:42:17 +01:00
James Bradbury	b105e19189	remove gitattributes	2019-08-23 15:13:51 +01:00
James Bradbury	39ad136441	handle merging of pbxproj	2019-05-25 12:25:34 +01:00