search

tanjyy / ridesio

Ridesharing iOS application for college students. Won 2nd place in the iOS category at CodePath Demo Day 2020.
https://tanjyy.github.io/ridesio
1 stars 1 forks source link

Issue 126 #136

Closed tahaafzal5 closed 3 years ago

tahaafzal5 commented 3 years ago

closes #126

nashirj commented 3 years ago

Can you please merge in the main branch and fix the merge conflicts? I will look at this PR after that. Currently, when I try to merge main, there are conflicts in the new ride view controller

tahaafzal5 commented 3 years ago

Okay, I fixed the merge conflicts. Can you try now?

nashirj commented 3 years ago

Looks great!