Authored by 王钱钧

修改冲突

@@ -9,7 +9,6 @@ @@ -9,7 +9,6 @@
9 #import <Foundation/Foundation.h> 9 #import <Foundation/Foundation.h>
10 #import <UIKit/UIKit.h> 10 #import <UIKit/UIKit.h>
11 #import "YHAnalyticsMacro.h" 11 #import "YHAnalyticsMacro.h"
12 -#import "YH_Analytics_Evevt.h"  
13 12
14 typedef NS_ENUM(NSInteger, YHLogStrategy) { 13 typedef NS_ENUM(NSInteger, YHLogStrategy) {
15 LogStrategyAppLaunch = 1, //每次程序启动 14 LogStrategyAppLaunch = 1, //每次程序启动