• 冷佳娟's avatar
    Merge branch 'terrillo' into develop · b0d36545
    冷佳娟 authored
    # Conflicts:
    #	RCTAppleHealthKit/RCTAppleHealthKit+Methods_Fitness.h
    #	RCTAppleHealthKit/RCTAppleHealthKit+Methods_Fitness.m
    #	RCTAppleHealthKit/RCTAppleHealthKit+Queries.m
    #	RCTAppleHealthKit/RCTAppleHealthKit+Utils.m
    #	RCTAppleHealthKit/RCTAppleHealthKit.m
    b0d36545
RCTAppleHealthKit+Methods_Fitness.h 1.81 KB