Merge remote-tracking branch 'vauto/master'

Conflicts: UIColor+Expanded.m
fcanas · Apr 4, 2012 · bd892e4 · bd892e4
2 parents 85a1bcf + a2180e6
commit bd892e4
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/UIColor+Expanded.m b/UIColor+Expanded.m
@@ -1098,9 +1098,7 @@ + (UIColor *)colorWithRGBDictionary:(NSDictionary *)colorDict {
 		[[colorDict objectForKey:@"green"] floatValue] <= 1.0 &&
 		[[colorDict objectForKey:@"alpha"] floatValue] <= 1.0
 		) {
-
 		color = [UIColor colorWithNormalizedRGBDictionary:colorDict];
-
 	} else {
 		color = [UIColor colorWithByteRGBDictionary:colorDict];
 	}