mobile / YH_EventReport · Commits

Go to a project

Authored by 戴强
Commit 7895eb21887e5efce6a03d04812d3194170a341c 1 parent b36011f9

fix merge conflicts

Inline Side-by-side
Showing 1 changed file with 0 additions and 4 deletions
@@ -9,11 +9,7 @@ @@ -9,11 +9,7 @@
9 Pod::Spec.new do |s| 9 Pod::Spec.new do |s|
10 10
11 s.name = "YHEventReport" 11 s.name = "YHEventReport"
12 -<<<<<<< HEAD  
13 s.version = "0.8.0" 12 s.version = "0.8.0"
14 -=======  
15 - s.version = "0.7.6"  
16 ->>>>>>> develop  
17 s.summary = "YHEventReport." 13 s.summary = "YHEventReport."
18 s.description = "无埋点SDK" 14 s.description = "无埋点SDK"
19 s.homepage = "http://git.yoho.cn/mobile/YH_EventReport" 15 s.homepage = "http://git.yoho.cn/mobile/YH_EventReport"