iOS / PNChart

Go to a project
Toggle navigation Toggle navigation pinning
Gianmaria Dal Maistro
3a6d8072 1 parent 2420e723

fixed conflict

Inline Side-by-side
Showing 2 changed files with 1 additions and 5 deletions
... ... @@ -65,8 +65,4 @@
- (void)recompute;
<<<<<<< Updated upstream
@end
=======
@end
>>>>>>> Stashed changes
... ...
... ... @@ -149,7 +149,7 @@
}
if (self.hideValues)
descriptionLabel.text = titleText;
descriptionLabel.text = titleText;
else if(!titleText || self.showOnlyValues)
descriptionLabel.text = titleValue;
else {
... ...