Merge branch 'master' of https://github.com/cls-02/TeraHz

docs/dependencies.md

@@ -4,6 +4,7 @@ The current development version of TeraHz has been verified to work with:
   - Python 3.6.8 (built from source code and altinstall'd)
   - Module versions (direct `pip3.6 list` output):
 
+<<<<<<< HEAD
 
       Package         Version  
       --------------- ---------
@@ -22,3 +23,24 @@ The current development version of TeraHz has been verified to work with:
       six             1.12.0   
       smbus           1.1.post2
       Werkzeug        0.15.4   
+=======
+  ```
+    Package         Version  
+    --------------- ---------
+    Click           7.0      
+    Flask           1.0.3    
+    itsdangerous    1.1.0    
+    Jinja2          2.10.1   
+    MarkupSafe      1.1.1    
+    numpy           1.16.4   
+    pandas          0.24.2   
+    pip             18.1     
+    pyserial        3.4      
+    python-dateutil 2.8.0    
+    pytz            2019.1   
+    setuptools      40.6.2   
+    six             1.12.0   
+    smbus           1.1.post2
+    Werkzeug        0.15.4   
+  ```
+>>>>>>> babd6d88dc695973a167e1dc6abf6c8217aeed8f