测试冲突

resources/app/us.main.js

@@ -3,7 +3,10 @@ const electron = require('electron')
 const app = electron.app
 // Module to create native browser window.
 const BrowserWindow = electron.BrowserWindow
-//测试权限
+//测试权限/
+
+
+//测试冲突
 
 // Keep a global reference of the window object, if you don't, the window will
 // be closed automatically when the JavaScript object is garbage collected.