up

LIB/MIDDLE/CellStateEstimation/Common/V1_0_1/log.py

@@ -17,11 +17,7 @@ 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\log_test\\'+self.name, level=Level,format='%(asctime)s - %(levelname)s - %(message)s')
->>>>>>> master
 
 
     def logopt(self,*info):