search

patdunlavey / orienteering-usa

orienteeringusa.org
GNU General Public License v2.0
2 stars 1 forks source link

Ousa patch 2 #25

Closed jnava19 closed 6 years ago

jnava19 commented 6 years ago

@patdunlavey Latest changes to css, main template file and the copyright.php in theme.

patdunlavey commented 6 years ago

Hi @jnava19 . I can't merge due to conflicts. Can you please git pull to your local, resolve any conflicts, commit, and push back up? Then I should be able to perform the merge.