search

womenhackfornonprofits / whfnp

Women Hack for Non-Profits Website Overhaul
18 stars 7 forks source link

Fixing old merge conflicts #147

Closed lili2311 closed 8 years ago

lili2311 commented 8 years ago

@womenhackfornonprofits/whfnp

What are the changes included in this PR?

Fixed 2 old merge conflicts that still seem to be in the codebase!