Permalink
Browse files

Committing conflict merge.

  • Loading branch information...
1 parent 21d6915 commit 427283006e0a56aebedf6269bf28b7f4c73b6916 @samus samus committed Oct 20, 2013
Showing with 1 addition and 1 deletion.
  1. +1 −1 ios/Camp Joy Outdoors/CJOIdentifyNavigationViewController.m
@@ -46,7 +46,7 @@ - (void)viewDidLoad
-(void)handleGlossaryNotification:(NSNotification *) notification {
NSDictionary * userInfo = notification.userInfo;
- NSString * term = userInfo[@"term"];
+ NSString * term = [userInfo[@"term"] stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
NSString *boardName = UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone ? @"glossary_iPhone" : @"glossary_iPad";
UIStoryboard *board = [UIStoryboard storyboardWithName:boardName bundle:nil];

0 comments on commit 4272830

Please sign in to comment.