Ryan Wilson 58d7075c97 Remove git merging code (#7932) ...

This was commented out so it wasn't caught.

#no-changelog

2021-04-21 14:24:53 -04:00

..

FIRMessagingAPNSInfo.h

Revert "Replace NSCoding with NSSecureCoding (#7831)" (#7863)

2021-04-08 10:25:27 -07:00

FIRMessagingAPNSInfo.m

Revert "Replace NSCoding with NSSecureCoding (#7831)" (#7863)

2021-04-08 10:25:27 -07:00

FIRMessagingAuthKeychain.h

Merge IID removal code to master (#7814)

2021-03-31 09:52:55 -07:00

FIRMessagingAuthKeychain.m

Merge IID removal code to master (#7814)

2021-03-31 09:52:55 -07:00

FIRMessagingAuthService.h

Merge IID removal code to master (#7814)

2021-03-31 09:52:55 -07:00

FIRMessagingAuthService.m

Merge IID removal code to master (#7814)

2021-03-31 09:52:55 -07:00

FIRMessagingBackupExcludedPlist.h

Merge IID removal code to master (#7814)

2021-03-31 09:52:55 -07:00

FIRMessagingBackupExcludedPlist.m

Merge IID removal code to master (#7814)

2021-03-31 09:52:55 -07:00

FIRMessagingCheckinPreferences.h

Merge IID removal code to master (#7814)

2021-03-31 09:52:55 -07:00

FIRMessagingCheckinPreferences.m

Merge IID removal code to master (#7814)

2021-03-31 09:52:55 -07:00

FIRMessagingCheckinService.h

Merge IID removal code to master (#7814)

2021-03-31 09:52:55 -07:00

FIRMessagingCheckinService.m

Merge IID removal code to master (#7814)

2021-03-31 09:52:55 -07:00

FIRMessagingCheckinStore.h

Merge IID removal code to master (#7814)

2021-03-31 09:52:55 -07:00

FIRMessagingCheckinStore.m

Merge IID removal code to master (#7814)

2021-03-31 09:52:55 -07:00

FIRMessagingKeychain.h

Merge IID removal code to master (#7814)

2021-03-31 09:52:55 -07:00

FIRMessagingKeychain.m

Merge IID removal code to master (#7814)

2021-03-31 09:52:55 -07:00

FIRMessagingTokenDeleteOperation.h

Merge IID removal code to master (#7814)

2021-03-31 09:52:55 -07:00

FIRMessagingTokenDeleteOperation.m

Merge IID removal code to master (#7814)

2021-03-31 09:52:55 -07:00

FIRMessagingTokenFetchOperation.h

Merge IID removal code to master (#7814)

2021-03-31 09:52:55 -07:00

FIRMessagingTokenFetchOperation.m

Merge IID removal code to master (#7814)

2021-03-31 09:52:55 -07:00

FIRMessagingTokenInfo.h

Revert "Replace NSCoding with NSSecureCoding (#7831)" (#7863)

2021-04-08 10:25:27 -07:00

FIRMessagingTokenInfo.m

Revert "Replace NSCoding with NSSecureCoding (#7831)" (#7863)

2021-04-08 10:25:27 -07:00

FIRMessagingTokenManager.h

Remove git merging code (#7932)

2021-04-21 14:24:53 -04:00

FIRMessagingTokenManager.m

Merge IID removal code to master (#7814)

2021-03-31 09:52:55 -07:00

FIRMessagingTokenOperation.h

Merge IID removal code to master (#7814)

2021-03-31 09:52:55 -07:00

FIRMessagingTokenOperation.m

Merge IID removal code to master (#7814)

2021-03-31 09:52:55 -07:00

FIRMessagingTokenStore.h

Merge IID removal code to master (#7814)

2021-03-31 09:52:55 -07:00

FIRMessagingTokenStore.m

Revert "Replace NSCoding with NSSecureCoding (#7831)" (#7863)

2021-04-08 10:25:27 -07:00