search

gfu-servant-engineering / tech-connect-frontend

Web platform for connecting the technological needs of front line mission groups with solution providers from churches, like-minded universities, and other mission minded organizations
https://tech-connect.netlify.com/
MIT License
0 stars 0 forks source link

Added the correct success stories as well as removed all references t… #33

Closed kjh61998 closed 5 years ago

kjh61998 commented 5 years ago

Adds the success stories, using a StoryTile in the components folder. The data is from the prosthetic team. They appear on the home page and the stories themselves have blogs associated with them.

This PR will also remove the references to "tags" as well as the files associated with tags.

kjh61998 commented 5 years ago

So it seems as though I have a conflicting file with the index page. How should this be resolved?

Edit: I'm going to make another commit and change the lines that are in conflict to match what is currently in master.

kjh61998 commented 5 years ago

Okay I'm actually going to close this so I can pull the changes that happened in the merge this morning, then reopen it once I make sure there are no more merge conflicts.