Explorar o código

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	tool_lib/util.py
Danny hai 1 ano
pai
achega
6ed38fa6c2
Modificáronse 2 ficheiros con 0 adicións e 3 borrados
  1. BIN=BIN
      time_recoder/time_recorded_tables/work_time_eren.xlsx
  2. 0 3
      tool_lib/util.py

BIN=BIN
time_recoder/time_recorded_tables/work_time_eren.xlsx


+ 0 - 3
tool_lib/util.py

@@ -36,9 +36,6 @@ import scipy.stats
 import tabulate
 import tabulate
 from scipy.ndimage import zoom
 from scipy.ndimage import zoom
 
 
-# from tool_lib import stack_tracer, print_exc_plus
-# from tool_lib.my_logger import logging
-
 X = Y = Z = float
 X = Y = Z = float