search

womenhackfornonprofits / whfnp

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

Conflict resolved in bootstrap paths #99

Closed tanyapowell closed 8 years ago

tanyapowell commented 8 years ago

@womenhackfornonprofits/whfnp

Noticed conflicts in the bootstrap.scss (which I have a feeling I may have caused... image

and have fixed them.

@lili2311 @EChesters if the commented out @imports aren't being used I'm happy to delete them and add to this PR

EChesters commented 8 years ago

The conflicts came from committing in merge conflict information. @lili2311 Could you please check your commits for these if it tells you, you have merge issues? It seems to have come from a previous commit of yours 🙂

Happy for the unused imports to be deleted.

Feel free to merge this, or I'm happy to re-review if you choose to remove the unused imports and push again.

tanyapowell commented 8 years ago

@EChesters unused imports removed too

lili2311 commented 8 years ago

yep sorry the fix was in this PR: https://github.com/womenhackfornonprofits/whfnp/pull/92