Closed SandraSmolerEisenberg closed 4 years ago
The Travis build cannot run before the merge conflicts are resolved. Do you want me to resolve it manually here or you want fix it on your local version?
We have checked the conflicts and they are no problem. Our commit should be accepted in the first one, CarSelect. And in the other one, strings.xml, both commits should be included. We just wanted you guys to review if you wanted before we merge it ourselves
There are currently 2 conflicts that prevent the CI build and prevent the merge.
Nice good job! :+1: :relaxed:
Related issue
60
Proposed changes