Fix conflicts

sebyddd · sebyddd · commit e90ceaa1e597 · 2016-05-29T13:11:03.000+03:00
diff --git a/SDVersion.podspec b/SDVersion.podspec
@@ -8,7 +8,7 @@ Pod::Spec.new do |s|
   #
 
   s.name         = "SDVersion"
-  s.version      = "3.0"
+  s.version      = "3.0.1"
   s.summary      = "Objective-C library for detecting running device model and screen size."
   s.homepage     = "https://github.com/sebyddd/SDVersion"
   s.screenshots  = "https://dl.dropboxusercontent.com/s/bmfjwfe2ngnivwn/sdversion.png?dl=0"

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ Pod::Spec.new do \|s\|`
`8`	`8`	`#`
`9`	`9`
`10`	`10`	`s.name = "SDVersion"`
`11`		`- s.version = "3.0"`
	`11`	`+ s.version = "3.0.1"`
`12`	`12`	`s.summary = "Objective-C library for detecting running device model and screen size."`
`13`	`13`	`s.homepage = "https://github.com/sebyddd/SDVersion"`
`14`	`14`	`s.screenshots = "https://dl.dropboxusercontent.com/s/bmfjwfe2ngnivwn/sdversion.png?dl=0"`