removed residual .orig files

2019-06-23 11:06:13 +02:00
parent f4d95e2441
commit bc0abbb985
1 changed files with 0 additions and 54 deletions
--- a/docs/dependencies.md.orig
+++ b/docs/dependencies.md.orig
@@ -1,54 +0,0 @@
-The current development version of TeraHz has been verified to work with:
-
-  - Raspbian Stretch (9)
-  - Python 3.6.8 (built from source code and altinstall'd)
-  - Module versions (direct `pip3.6 list` output):
-
-<<<<<<< HEAD
-<<<<<<< HEAD
-
-=======
-```
->>>>>>> Fixed dependency list
-      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   
-<<<<<<< HEAD
-=======
-  ```
-    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
-=======
-```
->>>>>>> Fixed dependency list