Rebase and rerun example

hgrecco · Aug 29, 2018 · 29296db · 29296db
1 parent 1c99107
commit 29296db
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/example-notebooks/basic-example.ipynb b/example-notebooks/basic-example.ipynb
@@ -98,8 +98,8 @@
       "pytest                    3.7.1                    py36_0    conda-forge\r\n",
       "pytest-cov                2.5.1                     <pip>\r\n",
       "python                    3.6.6                h5001a0f_0    conda-forge\r\n",
-      "python-dateutil           2.7.3                     <pip>\r\n",
       "python-dateutil           2.7.3                      py_0    conda-forge\r\n",
+      "python-dateutil           2.7.3                     <pip>\r\n",
       "pytz                      2018.5                    <pip>\r\n",
       "pyyaml                    3.12                     py36_1    conda-forge\r\n",
       "pyzmq                     17.1.2           py36hae99301_0    conda-forge\r\n",

diff --git a/pint/testsuite/pandas_test_interface.py b/pint/testsuite/pandas_test_interface.py
@@ -468,11 +468,7 @@ def test_op(a_pint, a_pint_array, b_, coerce=True):
                 for op in arithmetic_ops:
                     test_op(a_pint, a_pint_array, b)
                 for op in comparative_ops:
-<<<<<<< HEAD
-                    test_op(a_P,a_PA,b,coerce=False)
-=======
                     test_op(a_pint, a_pint_array, b, coerce=False)
->>>>>>> efc6049... Tidy up tests
 
     def test_mismatched_dimensions(self):
         x_and_ys=[