search

fx-chun / uchuujin

Nichijou: Uchuujin translation project
29 stars 5 forks source link

0000 progress to id 60/readme.md additions and fixes #12

Closed rustMotherboard closed 5 years ago

rustMotherboard commented 5 years ago

won't automatically merge atm, will fix soon

rustMotherboard commented 5 years ago

merge situation resolved

rustMotherboard commented 5 years ago

im not really sure what to change in the readme

fx-chun commented 5 years ago

There shouldn't be any commits affecting the README if this is strictly script work.

rustMotherboard commented 5 years ago

no i mean like the readme conflict im not sure what to do with that one

rustMotherboard commented 5 years ago

if i were to remove the file it'd remove it when it merges, so this pull request is also for giving the README.md some more information i guess

fx-chun commented 5 years ago

Please try not to mix changes in PRs; open a separate PR for the proposed README changes and file additions.

Refer to https://stackoverflow.com/questions/39459467/remove-a-modified-file-from-pull-request for instructions on removing changes from the PR.