mirror
/
glances
mirror of https://github.com/nicolargo/glances.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Correct issue following merge with json and csv output

This commit is contained in:
nicolargo 2022-09-09 18:25:37 +02:00
parent 0a39988a5a
commit bbc94568d6
2 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
glances/outputs/glances_stdout_csv.py
View File

@ -11,12 +11,8 @@
import time
<<<<<<< HEAD
from glances.logger import logger
from glances.globals import printandflush
=======
from glances.compat import printandflush
>>>>>>> develop
class GlancesStdoutCsv(object):

4
glances/outputs/glances_stdout_json.py
View File

@ -11,12 +11,8 @@
import time
<<<<<<< HEAD
from glances.logger import logger
from glances.globals import printandflush
=======
from glances.compat import printandflush
>>>>>>> develop
class GlancesStdoutJson(object):