From 24d7a97616f3dd8be792e66378f877fb90208b82 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 28 Sep 2018 10:23:53 -0400 Subject: [PATCH] Fix rebase breakage. --- Signal/src/ViewControllers/DebugUI/DebugContactsUtils.m | 2 +- SignalMessaging/utils/OWSGroupAvatarBuilder.m | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Signal/src/ViewControllers/DebugUI/DebugContactsUtils.m b/Signal/src/ViewControllers/DebugUI/DebugContactsUtils.m index 1655bf814..62ff70a2a 100644 --- a/Signal/src/ViewControllers/DebugUI/DebugContactsUtils.m +++ b/Signal/src/ViewControllers/DebugUI/DebugContactsUtils.m @@ -5,7 +5,7 @@ #import "DebugContactsUtils.h" #import "Signal-Swift.h" #import -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalMessaging/utils/OWSGroupAvatarBuilder.m b/SignalMessaging/utils/OWSGroupAvatarBuilder.m index 5b74a62ff..4e56cd2a6 100644 --- a/SignalMessaging/utils/OWSGroupAvatarBuilder.m +++ b/SignalMessaging/utils/OWSGroupAvatarBuilder.m @@ -8,6 +8,7 @@ #import "UIColor+OWS.h" #import #import +#import NS_ASSUME_NONNULL_BEGIN