Merge branch 'master' into development

digital-cinema-arts · Jan 5, 2020 · 4554310 · 4554310
2 parents a2f1234 + 6d09ad2
commit 4554310
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -108,9 +108,12 @@ optional arguments:
 
 ----------------------------------------------------------
 
+To fix an error with pandas on Linux that occasionally happens, force a reinstall with this command:
+
 ```
 pip install --upgrade --force-reinstall pandas
 ```
+
 ---------------------------------------------------------------------
 
 ![picture alt](https://github.com/digital-cinema-arts/Muse-Analysis-Tools/blob/master/images/GUI.png "The analyze_muse_data GUI")

diff --git a/analyze_muse/__init__.py b/analyze_muse/__init__.py
diff --git a/analyze_muse/resources/__init__.py b/analyze_muse/resources/__init__.py
diff --git a/setup.py b/setup.py
@@ -7,7 +7,6 @@
     name="Muse-Analysis-Tools",
     version="1.1.2",
 
-
     author="debra_peri",
 #    author="Debra Grace Peri",
     author_email="[email protected]",
-Original file line number
+Diff line change
@@ Expand Up / @@ -108,9 +108,12 @@ optional arguments: @@
     ----------------------------------------------------------
+    To fix an error with pandas on Linux that occasionally happens, force a reinstall with this command:
     ```
     pip install --upgrade --force-reinstall pandas
     ```
     ---------------------------------------------------------------------
     ![picture alt](https://github.com/digital-cinema-arts/Muse-Analysis-Tools/blob/master/images/GUI.png "The analyze_muse_data GUI")
@@ Expand Down @@