Skip to content

Conversation

@webdev03
Copy link
Contributor

@webdev03 webdev03 commented Dec 20, 2021

Fixes #18
Works

@jdev082
Copy link
Collaborator

jdev082 commented Dec 20, 2021

which order should I merge the two PRs

@hello-smile6
Copy link
Contributor

Closed by #19

@hello-smile6
Copy link
Contributor

which order should I merge the two PRs

Merge mine, then theirs.

@jdev082
Copy link
Collaborator

jdev082 commented Dec 20, 2021

I feel like this PR will have some issues with directories, the directory structure isn't already compatible with electron-forge

@webdev03
Copy link
Contributor Author

webdev03 commented Dec 20, 2021

Merge mine... I tried to build, it works, and it doesn't mess with npm run start in ways that might break.

@hello-smile6
Copy link
Contributor

Merge mine... I tried to build, it works.

Mine?

@webdev03
Copy link
Contributor Author

No, the one by @webdev03 please stop.

@hello-smile6
Copy link
Contributor

No, the one by @hello-smile6

I agree!!!

@webdev03
Copy link
Contributor Author

Please stop being mean...

@hello-smile6
Copy link
Contributor

Please stop being mean...

I'm not!

@webdev03
Copy link
Contributor Author

You are trying to edit my words, and I don't like it. Please stop.

@hello-smile6
Copy link
Contributor

You are trying to edit my words, and I don't like it. Please stop.

Not trying to, I actually am.

@webdev03
Copy link
Contributor Author

@JaydenDev which problems?

@jdev082 jdev082 merged commit 713849d into CatalystDevOrg:master Dec 20, 2021
@webdev03 webdev03 deleted the forge branch December 20, 2021 01:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Packaging with Electron-Forge

3 participants