stable 1.0 merged

hooks.js

@@ -39,7 +39,6 @@ module.exports = {
   },
 
   postPackage: async (forgeConfig, options) => {
-<<<<<<< HEAD
     // const resources = path.join(
     //   options.outputPaths[0],
     //   "resources/app/.webpack/main/resources"
@@ -62,32 +61,5 @@ module.exports = {
     //     console.log("Successful");
     //   }
     // });
-=======
-    const resources = path.join(
-      options.outputPaths[0],
-      process.platform == "darwin" ? "biseps.app/Contents/Resources/app/.webpack/main/resources" : "resources/app/.webpack/main/resources"
-    );
-    const jbrowse = path.join(
-      options.outputPaths[0],
-      process.platform == "darwin" ? 
-      "biseps.app/Contents/Resources/app/.webpack/main/backend/node_modules/" :
-      "resources/app/.webpack/main/backend/node_modules/"
-    );
-
-    chmodr(resources, 0o777, (err) => {
-      if (err) {
-        console.log("Failed to execute chmod", err);
-      } else {
-        console.log("Successful");
-      }
-    });
-    chmodr(jbrowse, 0o777, (err) => {
-      if (err) {
-        console.log("Failed to execute chmod", err);
-      } else {
-        console.log("Successful");
-      }
-    });
->>>>>>> c519aad0be4dbf8c60e1e3f5281cb5ffd6d8dfec
   },
 };