”修复冲突的问题“

e0380076 · quyatong · b5c4c129 · e0380076
隐藏空白更改
内联并排

Showing with 0 addition and 5 deletion

packages/chameleon-linter/checkers/script.js packages/chameleon-linter/checkers/script.js +0 -5

未找到文件。
--- a/packages/chameleon-linter/checkers/script.js
+++ b/packages/chameleon-linter/checkers/script.js
@@ -286,13 +286,8 @@ const checkScript = async (result) => {
    }
  });

-<<<<<<< Updated upstream
-  if (!result['interface']) {
-    let interfaceFile = script.file.replace(new RegExp('\.(' + platforms.join('|') + ')\.cml$', 'ig'), '.interface');
-=======
  if (!result['interface'] && script) {
    let interfaceFile = script.file.replace(new RegExp('\\.(' + platforms.join('|') + ')\\.cml$', 'ig'), '.interface');
->>>>>>> Stashed changes
    if (/\.interface$/.test(interfaceFile)) {
      result['interface'] = {
        messages: [{