mirror/glances
1
0
Fork 0
mirror of https://github.com/nicolargo/glances.git synced 2026-03-13 11:28:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Resolve merge issues

Browse Source
This commit is contained in:
nicolargo
2018-02-24 16:32:52 +01:00
parent fe1f85b839 c2863629dd
commit 7dcb753015
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
requirements.txt
View File

@@ -1 +1,5 @@
<<<<<<< HEAD
psutil==5.4.2
=======
psutil==5.3.0
>>>>>>> origin