qingfeng 2 years ago
parent
commit
ed6e64188e
1 changed files with 0 additions and 7 deletions
  1. 0 7
      LIB/MIDDLE/CellStateEstimation/Common/V1_0_1/log.py

+ 0 - 7
LIB/MIDDLE/CellStateEstimation/Common/V1_0_1/log.py

@@ -17,16 +17,9 @@ class Mylog:
                 Level=logging.WARNING
             else:
                 Level=logging.ERROR
-<<<<<<< HEAD
-        logging.basicConfig(filename=r'D:\01WorkSpace\python\data_analyze_platform\USER\SPF\01qixiang\101Log\\'+self.name, level=Level,format='%(asctime)s - %(levelname)s - %(message)s')
-=======
-
         logging.basicConfig(filename=r'D:\deploy\python_platform\data_analyze_platform\USER\SPF\01qixiang\101Log\\'+self.name, level=Level,format='%(asctime)s - %(levelname)s - %(message)s')
 
 
->>>>>>> dev
-
-
     def logopt(self,*info):
         logging.error(info)
         logging.error(traceback.format_exc())