Fixed a merge conflict.

Eric Rolf · Eric Rolf · commit 42bdb00d2f12 · 2017-05-09T14:21:35.000-04:00
diff --git a/CircleProgressView/CircleProgressView.swift b/CircleProgressView/CircleProgressView.swift
@@ -140,14 +140,14 @@ import UIKit
         if roundedCap {
             let capCenter = CGPoint(x: center.x + r * cos(endAngle), y: center.y + r * sin(endAngle))
         
-            progressPath.addArc(withCenter: capCenter, radius: trackWidth * 0.5, startAngle: endAngle, endAngle: endAngle + CGFloat(M_PI), clockwise: !clockwise)
+            progressPath.addArc(withCenter: capCenter, radius: trackWidth * 0.5, startAngle: endAngle, endAngle: endAngle + CGFloat(Double.pi), clockwise: !clockwise)
         }
         progressPath.addArc(withCenter: center, radius:radius-trackWidth, startAngle:endAngle, endAngle:startAngle, clockwise:clockwise)
         
         if roundedCap {
         let capCenter = CGPoint(x: center.x + r * cos(startAngle), y: center.y + r * sin(startAngle))
         
-            progressPath.addArc(withCenter: capCenter, radius: trackWidth * 0.5, startAngle: startAngle, endAngle: startAngle + CGFloat(M_PI), clockwise: clockwise)
+            progressPath.addArc(withCenter: capCenter, radius: trackWidth * 0.5, startAngle: startAngle, endAngle: startAngle + CGFloat(Double.pi), clockwise: clockwise)
         }
         progressPath.close()
         

Original file line number	Diff line number	Diff line change
`@@ -140,14 +140,14 @@ import UIKit`
`140`	`140`	`if roundedCap {`
`141`	`141`	`let capCenter = CGPoint(x: center.x + r * cos(endAngle), y: center.y + r * sin(endAngle))`
`142`	`142`
`143`		`- progressPath.addArc(withCenter: capCenter, radius: trackWidth * 0.5, startAngle: endAngle, endAngle: endAngle + CGFloat(M_PI), clockwise: !clockwise)`
	`143`	`+ progressPath.addArc(withCenter: capCenter, radius: trackWidth * 0.5, startAngle: endAngle, endAngle: endAngle + CGFloat(Double.pi), clockwise: !clockwise)`
`144`	`144`	`}`
`145`	`145`	`progressPath.addArc(withCenter: center, radius:radius-trackWidth, startAngle:endAngle, endAngle:startAngle, clockwise:clockwise)`
`146`	`146`
`147`	`147`	`if roundedCap {`
`148`	`148`	`let capCenter = CGPoint(x: center.x + r * cos(startAngle), y: center.y + r * sin(startAngle))`
`149`	`149`
`150`		`- progressPath.addArc(withCenter: capCenter, radius: trackWidth * 0.5, startAngle: startAngle, endAngle: startAngle + CGFloat(M_PI), clockwise: clockwise)`
	`150`	`+ progressPath.addArc(withCenter: capCenter, radius: trackWidth * 0.5, startAngle: startAngle, endAngle: startAngle + CGFloat(Double.pi), clockwise: clockwise)`
`151`	`151`	`}`
`152`	`152`	`progressPath.close()`
`153`	`153`