Fix rebase error

Author: dhirschfeld

pandas/io/parquet.py

@@ -63,25 +63,6 @@ def __init__(self):
             import pyarrow
             import pyarrow.parquet
         except ImportError:
-<<<<<<< HEAD
-            raise ImportError("pyarrow is required for parquet support\n\n"
-                              "you can install via conda\n"
-                              "conda install pyarrow -c conda-forge\n"
-                              "\nor via pip\n"
-                              "pip install -U pyarrow\n")
-
-        if LooseVersion(pyarrow.__version__) < LooseVersion('0.4.1'):
-            raise ImportError("pyarrow >= 0.4.1 is required for parquet"
-                              "support\n\n"
-                              "you can install via conda\n"
-                              "conda install pyarrow -c conda-forge\n"
-                              "\nor via pip\n"
-                              "pip install -U pyarrow\n")
-
-        self._pyarrow_lt_050 = LooseVersion(pyarrow.__version__) < '0.5.0'
-        self._pyarrow_lt_060 = LooseVersion(pyarrow.__version__) < '0.6.0'
-        self._pyarrow_lt_070 = LooseVersion(pyarrow.__version__) < '0.7.0'
-=======
             raise ImportError(
                 "pyarrow is required for parquet support\n\n"
                 "you can install via conda\n"
@@ -97,7 +78,6 @@ def __init__(self):
                 "\nor via pip\n"
                 "pip install -U pyarrow\n"
             )
->>>>>>> Updated pyarrow dep to 0.7.0
         self.api = pyarrow
 
     def write(self, df, path, compression='snappy',

pandas/tests/io/test_parquet.py

@@ -43,27 +43,7 @@ def engine(request):
 def pa():
     if not _HAVE_PYARROW:
         pytest.skip("pyarrow is not installed")
-<<<<<<< HEAD
-    return 'pyarrow'
-
-
-@pytest.fixture
-def pa_lt_070():
-    if not _HAVE_PYARROW:
-        pytest.skip("pyarrow is not installed")
-    if LooseVersion(pyarrow.__version__) >= LooseVersion('0.7.0'):
-        pytest.skip("pyarrow is >= 0.7.0")
-    return 'pyarrow'
-
-
-@pytest.fixture
-def pa_ge_070():
-    if not _HAVE_PYARROW:
-        pytest.skip("pyarrow is not installed")
-    if LooseVersion(pyarrow.__version__) < LooseVersion('0.7.0'):
-=======
     if LooseVersion(pyarrow.__version__) < '0.7.0':
->>>>>>> Updated pyarrow dep to 0.7.0
         pytest.skip("pyarrow is < 0.7.0")
     return 'pyarrow'