njhpca / njhpca.github.io

0 stars 1 forks source link

Ad bar updated JS #10

Closed boyang16 closed 1 year ago

boyang16 commented 1 year ago

I adjusted the JS code so the ads are now centered when viewing on the phone screen. However, when making this pull request it says it "can't automatically merge" but I can still create the pull request. I think is because I feel like changes to main are also happening when I am creating changes to ad-bar branch but I'm not too sure. I will create a pull request anyways as a start though, and I will try to sort out conflict later.

njhpca commented 1 year ago

You need to resolve the conflict.