fix conflicts

@@ -18,6 +18,6 @@ DerivedData
 *.hmap
 *.xccheckout
 Build/
-
+*.lock
 #CocoaPods
 Pods

@@ -16,7 +16,7 @@ Pod::Spec.new do |s|
   #
 
   s.name         = "PNChart"
-  s.version      = "0.8.2"
+  s.version      = "0.8.3"
   s.summary      = "A simple and beautiful chart lib with animation used in Piner for iOS"
 
   s.description  = <<-DESC
@@ -32,7 +32,7 @@ Pod::Spec.new do |s|
 
                   ## Requirements
 
-                  PNChart works on iOS 6.0 and later version and is compatible with ARC projects. It depends on the following Apple frameworks, which should already be included with most Xcode templates:
+                  PNChart works on iOS 7.0 and later version and is compatible with ARC projects. It depends on the following Apple frameworks, which should already be included with most Xcode templates:
 
                   * Foundation.framework
                   * UIKit.framework
@@ -77,7 +77,7 @@ Pod::Spec.new do |s|
   #  the deployment target. You can optionally include the target after the platform.
   #
 
-  s.platform     = :ios, "8.0"
+  s.platform     = :ios, "7.0"
 
   #  When using multiple platforms
   # s.ios.deployment_target = "5.0"
@@ -90,7 +90,7 @@ Pod::Spec.new do |s|
   #  Supports git, hg, bzr, svn and HTTP.
   #
 
-  s.source       = { :git => "https://github.com/kevinzhow/PNChart.git", :tag => "0.8.2" }
+  s.source       = { :git => "https://github.com/kevinzhow/PNChart.git", :tag => "0.8.3" }
 
 
   # ――― Source Code ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
@@ -143,6 +143,6 @@ Pod::Spec.new do |s|
   s.requires_arc = true
 
   # s.xcconfig = { "HEADER_SEARCH_PATHS" => "$(SDKROOT)/usr/include/libxml2" }
-  s.dependency 'UICountingLabel', '~> 1.0.0'
+  s.dependency 'UICountingLabel', '~> 1.2.0'
 
 end

@@ -183,6 +183,7 @@
         [_textLayer setAlignmentMode:kCAAlignmentCenter];
         [_textLayer setForegroundColor:[[UIColor colorWithRed:178/255.0 green:178/255. blue:178/255.0 alpha:1.0] CGColor]];
        _textLayer.hidden = YES;
+
     }
 
     return _textLayer;

@@ -64,6 +64,9 @@
     _rotateForXAxisText  = false;
     _isGradientShow      = YES;
     _isShowNumbers       = YES;
+	_yLabelFormatter = ^(CGFloat yValue){
+		return [NSString stringWithFormat:@"%1.f",yValue];
+	};
 }
 
 - (void)setYValues:(NSArray *)yValues
@@ -143,9 +146,10 @@
     }else{
         _xChartLabels = [NSMutableArray new];
     }
-    
-    if (_showLabel) {
-        _xLabelWidth = (self.frame.size.width - _chartMargin * 2) / [xLabels count];
+	
+	_xLabelWidth = (self.frame.size.width - _chartMargin * 2) / [xLabels count];
+	
+    if (_showLabel) {		
         int labelAddCount = 0;
         for (int index = 0; index < _xLabels.count; index++) {
             labelAddCount += 1;

@@ -409,7 +409,7 @@
             if (!(_yValueMax - _yValueMin)) {
                 innerGrade = 0.5;
             } else {
-                innerGrade = (yValue - _yValueMin) / (_yValueMax - _yValueMin) == 0 ? 0.5 : (yValue - _yValueMin) / (_yValueMax - _yValueMin);
+                innerGrade = (yValue - _yValueMin) / (_yValueMax - _yValueMin);
             }
             
             CGFloat offSetX = (_chartCavanWidth) / (chartData.itemCount);

 PODS:
-  - Expecta (0.3.2)
+  - Expecta (0.4.2)
   - UICountingLabel (1.2.0)
 
 DEPENDENCIES:
@@ -7,7 +7,8 @@ DEPENDENCIES:
   - UICountingLabel (~> 1.2.0)
 
 SPEC CHECKSUMS:
-  Expecta: 8c507baf13211207b1e9d0a741480600e6b4ed15
+  Expecta: 78b4e8b0c8291fa4524d7f74016b6065c2e391ec
   UICountingLabel: 1db4e7d023e1762171eb226d6dff47a7a84f27aa
 
 COCOAPODS: 0.37.1
+