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 @@ @@ -65,8 +65,4 @@
65 65
66 - (void)recompute; 66 - (void)recompute;
67 67
68 -<<<<<<< Updated upstream  
69 @end 68 @end
70 -=======  
71 -@end  
72 ->>>>>>> Stashed changes  
@@ -149,7 +149,7 @@ @@ -149,7 +149,7 @@
149 } 149 }
150 150
151 if (self.hideValues) 151 if (self.hideValues)
152 - descriptionLabel.text = titleText; 152 + descriptionLabel.text = titleText;
153 else if(!titleText || self.showOnlyValues) 153 else if(!titleText || self.showOnlyValues)
154 descriptionLabel.text = titleValue; 154 descriptionLabel.text = titleValue;
155 else { 155 else {