Merge conflitcs need help

mobileappdevhm / team2

A Flutter app providing international students with a timetable and the opportunity to sign up to courses.

https://mobileappdevhm.github.io/team2/

9 stars 5 forks source link

Open VoitreX opened 6 years ago

VoitreX commented 6 years ago

Just looking at differences

bennyboer commented 6 years ago

I think the cow is unhappy about these conflicts.

hmkrivoj commented 6 years ago

FirebaseController needs settings upon initialization, but settings are only available after login

VoitreX commented 6 years ago

Interesting Bug......

hmkrivoj commented 6 years ago

Fixed favorites screen bug and cleaned some of the code in the sqlite providers... Tests still need to be adjusted