From 022b2f93dd84568605c6ece2491191d555e0fcd3 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 5 Dec 2017 11:22:52 -0500 Subject: [PATCH] Respond to CR. --- SignalServiceKit/src/Util/AppContext.h | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/SignalServiceKit/src/Util/AppContext.h b/SignalServiceKit/src/Util/AppContext.h index 0dbf4f573..75a9f9146 100755 --- a/SignalServiceKit/src/Util/AppContext.h +++ b/SignalServiceKit/src/Util/AppContext.h @@ -28,22 +28,8 @@ typedef void (^BackgroundTaskExpirationHandler)(void); // Should only be called if isMainApp is YES. - (void)setMainAppBadgeNumber:(NSInteger)value; -<<<<<<< HEAD - (BOOL)isRTL; -||||||| parent of d1a8c9aa... Respond to CR. -// This should all migrations which do NOT qualify as safeBlockingMigrations: -- (NSArray *)allMigrations; - -// This should only include migrations which: -// -// a) Do read/write database transactions and therefore would block on the async database -// view registration. -// b) Will not affect any of the data used by the async database views. -- (NSArray *)safeBlockingMigrations; - -======= ->>>>>>> d1a8c9aa... Respond to CR. // Returns the VC that should be used to present alerts, modals, etc. - (nullable UIViewController *)frontmostViewController;