From 8624904cd4e03473ee8e3486c2c5d4d8224c3356 Mon Sep 17 00:00:00 2001
From: Geoffrey Goh <kg422@cornell.edu>
Date: Tue, 28 Jun 2016 14:53:42 -0700
Subject: [PATCH] fix bug from merge conflict resolution

---
 .../java/com/microsoft/codepush/react/CodePushNativeModule.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android/app/src/main/java/com/microsoft/codepush/react/CodePushNativeModule.java b/android/app/src/main/java/com/microsoft/codepush/react/CodePushNativeModule.java
index 9894599..8a88db1 100644
--- a/android/app/src/main/java/com/microsoft/codepush/react/CodePushNativeModule.java
+++ b/android/app/src/main/java/com/microsoft/codepush/react/CodePushNativeModule.java
@@ -452,7 +452,7 @@ public class CodePushNativeModule extends ReactContextBaseJavaModule {
     public void restartApp(boolean onlyIfUpdateIsPending, Promise promise) {
         // If this is an unconditional restart request, or there
         // is current pending update, then reload the app.
-        if (!onlyIfUpdateIsPending || CodePush.this.isPendingUpdate(null)) {
+        if (!onlyIfUpdateIsPending || mSettingsManager.isPendingUpdate(null)) {
             loadBundle();
             promise.resolve(true);
             return;