kindle manager

2020-06-30 12:58:59 +08:00
parent cf454693b6
commit 247a5cf2f3
7 changed files with 11 additions and 54 deletions
--- a/kman.py
+++ b/kman.py
@@ -593,10 +593,7 @@ class kMan:
            #serr = str(stream_stderr.read())
            #if sout: print('stdout {}'.format(sout))
            #if serr: print('stderr {}'.format(serr))
-<<<<<<< HEAD
-=======
            #print('os.name {} sout {}'.format(os.name,sout))
->>>>>>> 2d53124ab9aa26c9733646348174311d0967c8c0
            if os.name == 'nt':  # windows
                for d in sout.split('\n'):
                    if 'Kindle' in d: