-
Notifications
You must be signed in to change notification settings - Fork 6
About window #31
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
About window #31
Conversation
not-nef
commented
Jan 3, 2022

|
@im-coder-lg wanna send the readme text? |
|
What text? |
|
Does a704770 work? Just wanna know! |
you said you were gonna write a text for the about page |
|
it says there are conflicts. how do i resolve them? |
|
I'll manage that as well as help you. |
|
The thing is, @sumeshir26 might've added some code that preexisted here, so it asks which change to accept. I need you to get on to VS Code/Gitpod, open the conflicting files and right beside the changes, a faint "Accept" will be displayed. Choose your change and click that link/button(Electron JS) to change that. |
|
WHAT HAPPENED? WHERE ARE THE CHANGES? I can fix this, but why'd you close? |
|
And why can't I reopen the PR? |
|
He deleted his branch. Not sure why |
|
Merge conflicts? I said I will fix it though... @not-nef are you reopening this? |
|
no i will recode it. too many problems |
