search

Cocoanetics / DTFoundation

Standard toolset classes and categories
BSD 2-Clause "Simplified" License
803 stars 237 forks source link

tvOS support for subspecs #108

Closed ryanmaxwell closed 8 years ago

ryanmaxwell commented 8 years ago

Necessary for enabling tvOS support for DTCoreText

coveralls commented 8 years ago

Coverage Status

Coverage remained the same at 41.723% when pulling bc226858e49b95b5aaeff9a367123185c446c0e0 on cactuslab:develop into 4932fef6817720d3dfb8303c0b57eb9cef0421fb on Cocoanetics:develop.

coveralls commented 8 years ago

Coverage Status

Coverage remained the same at 41.723% when pulling 61dd479fc62a6cdc26d3a59740e4d8100a2909c6 on cactuslab:develop into 4932fef6817720d3dfb8303c0b57eb9cef0421fb on Cocoanetics:develop.

odrobnik commented 8 years ago

@ryanmaxwell please fix the conflicts so that I can merge this.

ryanmaxwell commented 8 years ago

@odrobnik as far as I'm aware there are no conflicts and this is ok to merge?

odrobnik commented 8 years ago

@ryanmaxwell Please do a pull --rebase from develop into your branch and push it.

odrobnik commented 8 years ago

@ryanmaxwell GitHub still seems to think that there is a conflict. So please pull --rebase