From d44b6dd594d7676d55e04461c09a7b8ec4582871 Mon Sep 17 00:00:00 2001
From: MomIsBestFriend <50263213+MomIsBestFriend@users.noreply.github.com>
Date: Sat, 9 Nov 2019 20:35:06 +0200
Subject: [PATCH] Resolved merge conflicts (#29506)

---
 pandas/compat/__init__.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pandas/compat/__init__.py b/pandas/compat/__init__.py
index 02347aa60c1745..890d0aca0019d1 100644
--- a/pandas/compat/__init__.py
+++ b/pandas/compat/__init__.py
@@ -37,7 +37,7 @@ def set_function_name(f, name, cls):
 
 
 # https://github.com/pandas-dev/pandas/pull/9123
-def is_platform_little_endian():
+def is_platform_little_endian() -> bool:
     """
     Checking if the running platform is little endian.
 
@@ -49,7 +49,7 @@ def is_platform_little_endian():
     return sys.byteorder == "little"
 
 
-def is_platform_windows():
+def is_platform_windows() -> bool:
     """
     Checking if the running platform is windows.
 
@@ -61,7 +61,7 @@ def is_platform_windows():
     return sys.platform == "win32" or sys.platform == "cygwin"
 
 
-def is_platform_linux():
+def is_platform_linux() -> bool:
     """
     Checking if the running platform is linux.
 
@@ -73,7 +73,7 @@ def is_platform_linux():
     return sys.platform == "linux2"
 
 
-def is_platform_mac():
+def is_platform_mac() -> bool:
     """
     Checking if the running platform is mac.
 
@@ -85,7 +85,7 @@ def is_platform_mac():
     return sys.platform == "darwin"
 
 
-def is_platform_32bit():
+def is_platform_32bit() -> bool:
     """
     Checking if the running platform is 32-bit.