gyq

a0e4e563 · 王勇飞 · 94ebaaa5 · a0e4e563 · a0e4e563
Commit a0e4e563 authored Jun 20, 2020 by 王勇飞
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 5 deletions

ic-deliver/app/base/db/metadata/app/platform.js
+0 -0

ic-deliver/app/base/system.js
+0 -5

No files found.
--- a/ic-deliver/app/base/db/metadata/app/platform.js
+++ b/ic-deliver/app/base/db/metadata/app/platform.js
--- a/ic-deliver/app/base/system.js
+++ b/ic-deliver/app/base/system.js
@@ -217,12 +217,7 @@ class System {
 			try {
 				ClassObj = require(objabspath);
 			} catch (e) {
-<<<<<<< HEAD
-				console.log("ooooooooooooooooooooooooooo");
-				console.log(e)
-=======
 				 console.log(e)
->>>>>>> 901900a178eab18cd3e4171b03f80dbaa5ca62e5
 				let fname = objsettings[packageName + "base"];
 				ClassObj = require(fname);
 			}