Resolve merge conflicts: Update application_android.h

youtube · Apr 22, 2024 · a42c264 · a42c264
1 parent efbbea7
commit a42c264
Showing 1 changed file with 1 addition and 6 deletions.
diff --git a/starboard/android/shared/application_android.h b/starboard/android/shared/application_android.h
@@ -128,13 +128,8 @@ class ApplicationAndroid
   void OnSuspend() override;
 
   // --- QueueApplication overrides ---
-<<<<<<< HEAD
-  bool MayHaveSystemEvents() override { return handle_system_events_; }
-  Event* WaitForSystemEventWithTimeout(SbTime time) override;
-=======
   bool MayHaveSystemEvents() override { return handle_system_events_.load(); }
-  Event* WaitForSystemEventWithTimeout(int64_t time) override;
->>>>>>> ed27e83d758 ([Android] Fix CPU spinning of StarboardMain. (#3027))
+  Event* WaitForSystemEventWithTimeout(SbTime time) override;
   void WakeSystemEventWait() override;
 
  private: