Resolving merge conflicts between refactor and mkxp-z

Browse Source

...

This commit is contained in:

Maruno17

2020-11-20 21:01:47 +00:00

parent ce6bc1737f

commit 6158e42635

6 changed files with 31 additions and 63 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

0

Data/Scripts/001_Technical/009_Deprecation.rb → Data/Scripts/001_Technical/010_Deprecation.rb

0

Data/Scripts/001_Technical/010_Validation.rb → Data/Scripts/001_Technical/011_Validation.rb

0

Data/Scripts/001_Technical/011_Errors.rb → Data/Scripts/001_Technical/012_Errors.rb