Pushed to cocospod

sensorsdata · Feb 25, 2016 · 7c906de · 7c906de
1 parent 74d90ef
commit 7c906de
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -2,11 +2,7 @@
 
 This is the official iOS SDK for Sensors Analytics.
 
-<<<<<<< HEAD
 ## Easy Installation
-=======
-## Easy install
->>>>>>> 28fb0460ffb117368094d3c4af7d995bdf13ffae
 
   1. Install [CocosPod](http://cocoapods.org/)
   2. Create a file named `Podfile` in your Xcode project and add the following line:
@@ -15,10 +11,6 @@ This is the official iOS SDK for Sensors Analytics.
 ```
   3. Run `pod install` in the Xcode project directory and restart XCode.
 
-<<<<<<< HEAD
-## To Learn More
-=======
 ## To learn more
->>>>>>> 28fb0460ffb117368094d3c4af7d995bdf13ffae
 
 See our [full manual](http://www.sensorsdata.cn/manual/ios_sdk.html)