resolved conflicts

sagarbaba · Mar 21, 2017 · 28d9748 · 28d9748
2 parents 36cd10b + 88998c7
commit 28d9748
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -26,10 +26,10 @@ To install PSLab on Debian based Gnu/Linux system, the following dependencies mu
 * PyQt 4.7+, PySide, or PyQt5
 * python 2.6, 2.7, or 3.x
 * NumPy, Scipy
-* pyqt4-dev-tools         &nbsp;   #for pyuic4
-* Pyqtgraph               &nbsp;  #Plotting library
-* pyopengl and qt-opengl  &nbsp;   #for 3D graphics
-* iPython-qtconsole       &nbsp;   #optional
+* pyqt4-dev-tools         &nbsp;   **For pyuic4**
+* Pyqtgraph               &nbsp;  **For Plotting library**
+* pyopengl and qt-opengl  &nbsp;   **For 3D graphics**
+* iPython-qtconsole       &nbsp;   **optional**
 
 
 ##### Now clone both the repositories [pslab-apps](https://github.com/fossasia/pslab-apps)  and [pslab](https://github.com/fossasia/pslab).
@@ -85,3 +85,4 @@ Then go to pslab/docs and run the following command
 * [Design your own Experiments](http://blog.fossasia.org/design-your-own-experiments-with-pslab/)
 * [New Tools and Sensors for Fossasia PSLab and ExpEYES](http://blog.fossasia.org/new-tools-and-sensors-fossasia-pslab-and-expeyes/) 
 
+