gyq

ic-deliver/app/base/system.js

@@ -217,12 +217,7 @@ class System {
 			try {
 			try {
 				ClassObj = require(objabspath);
 				ClassObj = require(objabspath);
 			} catch (e) {
 			} catch (e) {
-<<<<<<< HEAD
-				console.log("ooooooooooooooooooooooooooo");
-				console.log(e)
-=======
 				 console.log(e)
 				 console.log(e)
->>>>>>> 901900a178eab18cd3e4171b03f80dbaa5ca62e5
 				let fname = objsettings[packageName + "base"];
 				let fname = objsettings[packageName + "base"];
 				ClassObj = require(fname);
 				ClassObj = require(fname);
 			}
 			}