Removed merge conflicts

Author: TimOliver

TORoundedButton/TORoundedButton.m

@@ -231,14 +231,10 @@ - (void)layoutSubviews {
     UIView *const contentView = _overrideContentView ?: _contentView;
     contentView.frame = ({
         CGRect frame = contentBounds;
-<<<<<<< Updated upstream
-        frame.size = [contentView sizeThatFits:contentBounds.size];
-=======
         const CGSize intrinsicContentSize = contentView.intrinsicContentSize;
         if (intrinsicContentSize.width > 0.0f && intrinsicContentSize.height > 0.0f) {
             frame.size = [contentView sizeThatFits:contentBounds.size];
         }
->>>>>>> Stashed changes
         frame.origin.x = (boundsSize.width - frame.size.width) * 0.5f;
         frame.origin.y = (boundsSize.height - frame.size.height) * 0.5f;
         CGRectIntegral(frame);