DIT112-V20 / group-04

MIT License
2 stars 5 forks source link

Refactor user interface #70

Closed SandraSmolerEisenberg closed 4 years ago

SandraSmolerEisenberg commented 4 years ago

Related issue

Proposed changes

krasen86 commented 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?

SandraSmolerEisenberg commented 4 years ago

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

krasen86 commented 4 years ago

There are currently 2 conflicts that prevent the CI build and prevent the merge.

chrytsa commented 4 years ago

Nice good job! :+1: :relaxed: