Fix Tool manager Siemens

2019-01-22 13:00:00 +01:00
parent e52e9128e8
commit dbbbecd2e5
9 changed files with 52 additions and 14 deletions
@@ -20,11 +20,7 @@ namespace Client.Utils
        public static String CEF_LOCALES_PATH           = BASE_PATH + "CEF\\Resources\\locales";
        public static String CEF_EXCEPTIONLOG_PATH      = BASE_PATH + "ExceptionLog";
        public static String errorPageFile              = BASE_PATH + "error.pg";
-<<<<<<< HEAD
-        public static String JOB_OPENING_PATH           = "C:\\CMS\\ACTIVE\\TMP\\clientTmpJob\\";
-=======
-        public static String JOB_OPENING_PATH           = "C:\\CMS\\Active\\TMP\\clientTmpJob\\";
->>>>>>> feature/Scada
+        public static String JOB_OPENING_PATH           = "C:\\CMS\\ACTIVE\\TMP\\clientTmpJob\\";
        
        //Config Names
        public const string CONFIG_KEY              = "Config";