It states that the branches cannot be automatically merged, but I have checked and made sure that there are no real conflicts. You can just overwrite with the new.
Note: I have not actually implemented the disabling of the halloween countdown. To ensure that that modal is up to date, just replace the url that is in the script. (external modals take up less room, and make the code cleaner)
It states that the branches cannot be automatically merged, but I have checked and made sure that there are no real conflicts. You can just overwrite with the new.
Note: I have not actually implemented the disabling of the halloween countdown. To ensure that that modal is up to date, just replace the url that is in the script. (external modals take up less room, and make the code cleaner)